diff options
Diffstat (limited to 'abs/core/mythtv/stable-29')
6 files changed, 1216 insertions, 1299 deletions
diff --git a/abs/core/mythtv/stable-29/git_src/git_hash b/abs/core/mythtv/stable-29/git_src/git_hash index 097003a..af68561 100644 --- a/abs/core/mythtv/stable-29/git_src/git_hash +++ b/abs/core/mythtv/stable-29/git_src/git_hash @@ -1 +1 @@ -280138b452c16c3ce02734b57d9245f91002af81 +ccbded85c9bff63275013e230a5f19fa4a955640 diff --git a/abs/core/mythtv/stable-29/mythplugins/PKGBUILD b/abs/core/mythtv/stable-29/mythplugins/PKGBUILD index 55e70b5..169e132 100644 --- a/abs/core/mythtv/stable-29/mythplugins/PKGBUILD +++ b/abs/core/mythtv/stable-29/mythplugins/PKGBUILD @@ -9,7 +9,7 @@ pkgname=('mytharchive' 'mythweather' 'mythzoneminder') pkgver=29.1 -pkgrel=3 +pkgrel=4 arch=('x86_64') url="http://www.mythtv.org" license=('GPL') diff --git a/abs/core/mythtv/stable-29/mythtv/0259-0117-UI-Provide-dbase-cache-for-RegisterKey-and-RegisterJ.patch b/abs/core/mythtv/stable-29/mythtv/0259-0117-UI-Provide-dbase-cache-for-RegisterKey-and-RegisterJ.patch deleted file mode 100644 index 79169e4..0000000 --- a/abs/core/mythtv/stable-29/mythtv/0259-0117-UI-Provide-dbase-cache-for-RegisterKey-and-RegisterJ.patch +++ /dev/null @@ -1,276 +0,0 @@ -From 53ab06dc745938d2ea74214fc10a2b5446bac01a Mon Sep 17 00:00:00 2001 -From: Lawrence Rust <lvr@softsystem.co.uk> -Date: Wed, 5 Jun 2013 16:07:56 +0100 -Subject: [PATCH 117/333] UI: Provide dbase cache for RegisterKey and - RegisterJump to speed startup - -Signed-off-by: Lawrence Rust <lvr@softsystem.co.uk> ---- - mythtv/libs/libmythui/mythmainwindow.cpp | 211 +++++++++++++++++++++--------- - 1 file changed, 147 insertions(+), 64 deletions(-) - -diff --git a/mythtv/libs/libmythui/mythmainwindow.cpp b/mythtv/libs/libmythui/mythmainwindow.cpp -index c765279..226454a 100644 ---- a/mythtv/libs/libmythui/mythmainwindow.cpp -+++ b/mythtv/libs/libmythui/mythmainwindow.cpp -@@ -25,6 +25,9 @@ using namespace std; - #include <QKeyEvent> - #include <QKeySequence> - #include <QSize> -+#include <QPair> -+#include <QMap> -+#include <QMutexLocker> - - // Platform headers - #include "unistd.h" -@@ -1765,67 +1768,107 @@ void MythMainWindow::BindKey(const QString &context, const QString &action, - void MythMainWindow::RegisterKey(const QString &context, const QString &action, - const QString &description, const QString &key) - { -- QString keybind = key; -- -- MSqlQuery query(MSqlQuery::InitCon()); -+ typedef QPair< QString,QString > key_t; // context, action -+ typedef QPair< QString,QString > val_t; // keybind, description -+ typedef QMap< key_t,val_t > cache_t; -+ static cache_t s_cache; -+ static QMutex s_mutex; - -- if (d->m_useDB && query.isConnected()) -+ if (s_cache.empty() && d->m_useDB) - { -- query.prepare("SELECT keylist, description FROM keybindings WHERE " -- "context = :CONTEXT AND action = :ACTION AND " -- "hostname = :HOSTNAME ;"); -- query.bindValue(":CONTEXT", context); -- query.bindValue(":ACTION", action); -- query.bindValue(":HOSTNAME", GetMythDB()->GetHostName()); -- -- if (query.exec() && query.next()) -+ MSqlQuery query(MSqlQuery::InitCon()); -+ if (query.isConnected()) - { -- keybind = query.value(0).toString(); -- QString db_description = query.value(1).toString(); -- -- // Update keybinding description if changed -- if (db_description != description) -+ query.prepare("SELECT context, action, keylist, description " -+ "FROM keybindings WHERE hostname = :HOSTNAME ;"); -+ query.bindValue(":HOSTNAME", GetMythDB()->GetHostName()); -+ if (query.exec()) - { -- LOG(VB_GENERAL, LOG_NOTICE, -- "Updating keybinding description..."); -- query.prepare( -- "UPDATE keybindings " -- "SET description = :DESCRIPTION " -- "WHERE context = :CONTEXT AND " -- " action = :ACTION AND " -- " hostname = :HOSTNAME"); -- -- query.bindValue(":DESCRIPTION", description); -- query.bindValue(":CONTEXT", context); -- query.bindValue(":ACTION", action); -- query.bindValue(":HOSTNAME", GetMythDB()->GetHostName()); -- -- if (!query.exec() && !(GetMythDB()->SuppressDBMessages())) -+ QMutexLocker locker(&s_mutex); -+ while (query.next()) - { -- MythDB::DBError("Update Keybinding", query); -+ key_t k(query.value(0).toString(), query.value(1).toString()); -+ val_t v(query.value(2).toString(), query.value(3).toString()); -+ s_cache[k] = v; - } - } -+ else if (!GetMythDB()->SuppressDBMessages()) -+ MythDB::DBError("RegisterKey", query); - } -- else -+ } -+ -+ QString keybind = key; -+ QString db_description; -+ bool bFound = false; -+ { -+ QMutexLocker locker(&s_mutex); -+ cache_t::const_iterator it = s_cache.find(key_t(context, action)); -+ if (it != s_cache.end()) - { -- QString inskey = keybind; -- -- query.prepare("INSERT INTO keybindings (context, action, " -- "description, keylist, hostname) VALUES " -- "( :CONTEXT, :ACTION, :DESCRIPTION, :KEYLIST, " -- ":HOSTNAME );"); -- query.bindValue(":CONTEXT", context); -- query.bindValue(":ACTION", action); -+ keybind = it->first; -+ db_description = it->second; -+ bFound = true; -+ } -+ } -+ -+ if (bFound) -+ { -+ // Update keybinding description if changed -+ if (db_description != description && d->m_useDB) -+ { -+ LOG(VB_GENERAL, LOG_NOTICE, "Updating keybinding description..."); -+ -+ MSqlQuery query(MSqlQuery::InitCon()); -+ -+ query.prepare( -+ "UPDATE keybindings " -+ "SET description = :DESCRIPTION " -+ "WHERE context = :CONTEXT AND " -+ " action = :ACTION AND " -+ " hostname = :HOSTNAME"); -+ - query.bindValue(":DESCRIPTION", description); -- query.bindValue(":KEYLIST", inskey); -- query.bindValue(":HOSTNAME", GetMythDB()->GetHostName()); -+ query.bindValue(":CONTEXT", context); -+ query.bindValue(":ACTION", action); -+ query.bindValue(":HOSTNAME", GetMythDB()->GetHostName()); - - if (!query.exec() && !(GetMythDB()->SuppressDBMessages())) - { -- MythDB::DBError("Insert Keybinding", query); -+ MythDB::DBError("Update Keybinding", query); - } - } - } -+ else if (d->m_useDB) -+ { -+ LOG(VB_GENERAL, LOG_NOTICE, QString("Add keybinding %1::%2 = %3") -+ .arg(context).arg(action).arg(keybind) ); -+ -+ MSqlQuery query(MSqlQuery::InitCon()); -+ -+ QString inskey = keybind; -+ -+ query.prepare("INSERT INTO keybindings (context, action, " -+ "description, keylist, hostname) VALUES " -+ "( :CONTEXT, :ACTION, :DESCRIPTION, :KEYLIST, " -+ ":HOSTNAME );"); -+ query.bindValue(":CONTEXT", context); -+ query.bindValue(":ACTION", action); -+ query.bindValue(":DESCRIPTION", description); -+ query.bindValue(":KEYLIST", inskey); -+ query.bindValue(":HOSTNAME", GetMythDB()->GetHostName()); -+ -+ if (!query.exec() && !(GetMythDB()->SuppressDBMessages())) -+ { -+ MythDB::DBError("Insert Keybinding", query); -+ } -+ else -+ { -+ QMutexLocker locker(&s_mutex); -+ key_t k(context, action); -+ val_t v(keybind, description); -+ s_cache[k] = v; -+ } -+ } - - BindKey(context, action, keybind); - d->actionText[context][action] = description; -@@ -1930,35 +1973,75 @@ void MythMainWindow::RegisterJump(const QString &destination, - const QString &key, void (*callback)(void), - bool exittomain, QString localAction) - { -- QString keybind = key; -+ typedef QPair< QString,QString > val_t; // keylist, description -+ typedef QMap< QString,val_t > cache_t; // destination -> keylist, description -+ static cache_t s_cache; -+ static QMutex s_mutex; - -- MSqlQuery query(MSqlQuery::InitCon()); -- if (query.isConnected()) -+ if (s_cache.empty() && d->m_useDB) - { -- query.prepare("SELECT keylist FROM jumppoints WHERE " -- "destination = :DEST and hostname = :HOST ;"); -- query.bindValue(":DEST", destination); -- query.bindValue(":HOST", GetMythDB()->GetHostName()); -- -- if (query.exec() && query.next()) -+ MSqlQuery query(MSqlQuery::InitCon()); -+ if (query.isConnected()) - { -- keybind = query.value(0).toString(); -+ query.prepare("SELECT destination, keylist, description " -+ "FROM jumppoints WHERE hostname = :HOSTNAME ;"); -+ query.bindValue(":HOSTNAME", GetMythDB()->GetHostName()); -+ if (query.exec()) -+ { -+ QMutexLocker locker(&s_mutex); -+ while (query.next()) -+ { -+ val_t v(query.value(1).toString(), query.value(2).toString()); -+ s_cache.insert(query.value(0).toString(), v); -+ } -+ } -+ else if (!GetMythDB()->SuppressDBMessages()) -+ MythDB::DBError("RegisterJump", query); - } -- else -+ } -+ -+ QString keybind = key; -+ bool bFound = false; -+ { -+ QMutexLocker locker(&s_mutex); -+ cache_t::const_iterator it = s_cache.find(destination); -+ if (it != s_cache.end()) - { -- QString inskey = keybind; -+ keybind = it->first; -+ bFound = true; -+ } -+ } - -- query.prepare("INSERT INTO jumppoints (destination, description, " -- "keylist, hostname) VALUES ( :DEST, :DESC, :KEYLIST, " -- ":HOST );"); -+ if (!bFound) -+ { -+ MSqlQuery query(MSqlQuery::InitCon()); -+ if (query.isConnected()) -+ { -+ query.prepare("SELECT keylist FROM jumppoints WHERE " -+ "destination = :DEST and hostname = :HOST ;"); - query.bindValue(":DEST", destination); -- query.bindValue(":DESC", description); -- query.bindValue(":KEYLIST", inskey); - query.bindValue(":HOST", GetMythDB()->GetHostName()); - -- if (!query.exec() || !query.isActive()) -+ if (query.exec() && query.next()) - { -- MythDB::DBError("Insert Jump Point", query); -+ keybind = query.value(0).toString(); -+ } -+ else -+ { -+ QString inskey = keybind; -+ -+ query.prepare("INSERT INTO jumppoints (destination, description, " -+ "keylist, hostname) VALUES ( :DEST, :DESC, :KEYLIST, " -+ ":HOST );"); -+ query.bindValue(":DEST", destination); -+ query.bindValue(":DESC", description); -+ query.bindValue(":KEYLIST", inskey); -+ query.bindValue(":HOST", GetMythDB()->GetHostName()); -+ -+ if (!query.exec() || !query.isActive()) -+ { -+ MythDB::DBError("Insert Jump Point", query); -+ } - } - } - } --- -1.7.9.5 - diff --git a/abs/core/mythtv/stable-29/mythtv/PKGBUILD b/abs/core/mythtv/stable-29/mythtv/PKGBUILD index e3afb4f..5bc782a 100644 --- a/abs/core/mythtv/stable-29/mythtv/PKGBUILD +++ b/abs/core/mythtv/stable-29/mythtv/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mythtv pkgver=29.1 -pkgrel=3 +pkgrel=4 commit_hash=`cat ../git_src/git_hash` pkgdesc="A Homebrew PVR project $commit_hash" arch=('x86_64') @@ -33,12 +33,12 @@ patches=( 'defaultThemeLinHES.patch' 'addEnableDisableAutoShutdownToSystemMenu.patch' 'mythfrontend_en_us.ts_Title_Case.patch' + 'fixTranslations.patch' 'pull103-Add-heuristic-in-TMDB-script-to-detect-movie-release-years.patch' '0006-cardutil_show_displayname.patch' + '0287-MythUiImage-Don-t-block-UI-when-exiting-screens.patch' '0292-UPnP-Reduce-startup-latency-by-moving-blocking-code-to-own-thread.patch' '0294-0283-FE-Add-network-status-to-machine-status-dialog.patch' - '0287-MythUiImage-Don-t-block-UI-when-exiting-screens.patch' - '0259-0117-UI-Provide-dbase-cache-for-RegisterKey-and-RegisterJ.patch' ) optdepends=() @@ -138,11 +138,11 @@ md5sums=('fb5a87c52a31168a0c8fdde72f27cc45' '6add9c16bbb988067e82029327e567b2' 'b0b238320fa78a4928dce2cea7c85071' '8e4492d1777234a021f368bd6ee964ee' - 'e7c148608832563b418ffaad5f8498eb' + 'e9aad003573bf3df5f4b940335f8bc12' + '17452a48ef2e27740f961480449b6303' 'd05eaf66c434a131c8efb4d87e99b402' '5f2bd4065b145b7b7ff09dfd6f08276c' + '3cccbab70c7615bc47e51790e024d5bf' '1f0dbd44f8c1a89b86bb331086f58578' 'abaef221b00690b329f4dca18676bcd6' - '3cccbab70c7615bc47e51790e024d5bf' - '4b5f00a19006b915b7ee5ab7f861599a' '633cd853a89aeee5388daaad21ccec28') diff --git a/abs/core/mythtv/stable-29/mythtv/fixTranslations.patch b/abs/core/mythtv/stable-29/mythtv/fixTranslations.patch new file mode 100644 index 0000000..582afe0 --- /dev/null +++ b/abs/core/mythtv/stable-29/mythtv/fixTranslations.patch @@ -0,0 +1,78 @@ +diff --git a/mythtv/programs/mythfrontend/audiogeneralsettings.h b/mythtv/programs/mythfrontend/audiogeneralsettings.h +index 79aa41dd8d..46421a84c2 100644 +--- a/mythtv/programs/mythfrontend/audiogeneralsettings.h ++++ b/mythtv/programs/mythfrontend/audiogeneralsettings.h +@@ -19,6 +19,8 @@ class AudioTest; + + class AudioConfigScreen : public StandardSettingDialog + { ++ Q_OBJECT ++ + public: + AudioConfigScreen(MythScreenStack *parent, const char *name, + GroupSetting *groupSetting); +diff --git a/mythtv/programs/mythfrontend/globalsettings.cpp b/mythtv/programs/mythfrontend/globalsettings.cpp +index 4507619170..0618f9762b 100644 +--- a/mythtv/programs/mythfrontend/globalsettings.cpp ++++ b/mythtv/programs/mythfrontend/globalsettings.cpp +@@ -3871,7 +3871,7 @@ class PlayBackScaling : public GroupSetting + PlayBackScaling::PlayBackScaling() + :GroupSetting() + { +- setLabel(tr("Scaling")); ++ setLabel(PlaybackSettings::tr("Scaling")); + addChild(m_VertScan = VertScanPercentage()); + addChild(m_YScan = YScanDisplacement()); + addChild(m_HorizScan = HorizScanPercentage()); +@@ -3894,7 +3894,7 @@ void PlayBackScaling::updateButton(MythUIButtonListItem *item) + m_HorizScan->getValue() == "0" && + m_YScan->getValue() == "0" && + m_XScan->getValue() == "0") +- item->SetText(tr("No scaling"),"value"); ++ item->SetText(PlaybackSettings::tr("No scaling"),"value"); + else + item->SetText(QString("%1%x%2%+%3%+%4%") + .arg(m_HorizScan->getValue()) +@@ -4364,7 +4364,7 @@ ChannelCheckBoxSetting::ChannelCheckBoxSetting(uint chanid, + m_channelId(chanid) + { + setLabel(QString("%1 %2").arg(channum).arg(channame)); +- setHelpText(tr("Select/Unselect channels for this channel group")); ++ setHelpText(ChannelGroupSettings::tr("Select/Unselect channels for this channel group")); + } + + ChannelGroupSetting::ChannelGroupSetting(const QString &groupName, +diff --git a/mythtv/programs/mythfrontend/globalsettings.h b/mythtv/programs/mythfrontend/globalsettings.h +index e069ec1cfb..8c1de7a02e 100644 +--- a/mythtv/programs/mythfrontend/globalsettings.h ++++ b/mythtv/programs/mythfrontend/globalsettings.h +@@ -259,6 +259,8 @@ class PlaybackProfileConfig : public GroupSetting + + class ChannelGroupSetting : public GroupSetting + { ++ Q_OBJECT ++ + public: + ChannelGroupSetting(const QString &groupName, int groupId); + virtual void Load(); +diff --git a/mythtv/programs/mythtv-setup/backendsettings.cpp b/mythtv/programs/mythtv-setup/backendsettings.cpp +index 6de0bae49d..bf24cc4f1a 100644 +--- a/mythtv/programs/mythtv-setup/backendsettings.cpp ++++ b/mythtv/programs/mythtv-setup/backendsettings.cpp +@@ -126,11 +126,12 @@ class IpAddressSettings : public HostCheckBoxSetting + explicit IpAddressSettings(/*Setting* trigger*/) : + HostCheckBoxSetting("ListenOnAllIps") + { +- setLabel(QObject::tr("Listen on All IP Addresses")); ++ setLabel(BackendSettings::tr("Listen on All IP Addresses")); + setValue(true); +- setHelpText(tr("Allow this backend to receive connections on any IP " +- "Address assigned to it. Recommended for most users " +- "for ease and reliability.")); ++ setHelpText(BackendSettings::tr("Allow this backend to receive " ++ "connections on any IP Address assigned to it. " ++ "Recommended for most users for ease and " ++ "reliability.")); + + localServerIP = LocalServerIP(); + localServerIP6 = LocalServerIP6(); diff --git a/abs/core/mythtv/stable-29/mythtv/mythfrontend_en_us.ts_Title_Case.patch b/abs/core/mythtv/stable-29/mythtv/mythfrontend_en_us.ts_Title_Case.patch index c4ce70a..412db21 100644 --- a/abs/core/mythtv/stable-29/mythtv/mythfrontend_en_us.ts_Title_Case.patch +++ b/abs/core/mythtv/stable-29/mythtv/mythfrontend_en_us.ts_Title_Case.patch @@ -1,5 +1,5 @@ ---- src/mythtv/i18n/mythfrontend_en_us.ts.orig 2018-01-25 13:58:55.277053891 +0000 -+++ src/mythtv/i18n/mythfrontend_en_us.ts 2018-01-25 13:58:44.968390548 +0000 +--- src/mythtv/i18n/mythfrontend_en_us.ts.orig 2018-05-23 18:35:11.221352872 +0000 ++++ src/mythtv/i18n/mythfrontend_en_us.ts 2018-05-24 18:05:31.175217406 +0000 @@ -573,7 +573,7 @@ <message> <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="400"/> @@ -75,7 +75,7 @@ </message> <message> <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="492"/> -@@ -715,32 +715,31 @@ +@@ -715,32 +715,32 @@ <message> <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="494"/> <source>Holiday-children</source> @@ -83,11 +83,10 @@ + <translation>Holiday-Children</translation> </message> <message> -- <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="496"/> -- <source>Holiday-children special</source> + <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="496"/> + <source>Holiday-children special</source> - <translation>Holiday-children special</translation> -+ <source>Holiday-Children Special</source> -+ <translation type="vanished">Holiday-Children Special</translation> ++ <translation>Holiday-Children Special</translation> </message> <message> <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="498"/> @@ -115,7 +114,7 @@ </message> <message> <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="510"/> -@@ -765,12 +764,12 @@ +@@ -765,12 +765,12 @@ <message> <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="524"/> <source>Music special</source> @@ -130,19 +129,8 @@ </message> <message> <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="528"/> -@@ -778,9 +777,18 @@ - <translation>Musical</translation> - </message> +@@ -780,7 +780,7 @@ <message> -+ <source>Musical Comedy</source> -+ <translation type="vanished">Musical comedy</translation> -+ </message> -+ <message> -+ <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="496"/> -+ <source>Holiday-children special</source> -+ <translation>Holiday-Chidren Special</translation> -+ </message> -+ <message> <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="530"/> <source>Musical comedy</source> - <translation>Musical comedy</translation> @@ -150,7 +138,7 @@ </message> <message> <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="538"/> -@@ -795,7 +803,7 @@ +@@ -795,7 +795,7 @@ <message> <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="542"/> <source>Public affairs</source> @@ -159,7 +147,7 @@ </message> <message> <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="544"/> -@@ -810,7 +818,7 @@ +@@ -810,7 +810,7 @@ <message> <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="552"/> <source>Romance-comedy</source> @@ -168,7 +156,7 @@ </message> <message> <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="554"/> -@@ -825,12 +833,12 @@ +@@ -825,12 +825,12 @@ <message> <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="560"/> <source>Science fiction</source> @@ -183,7 +171,7 @@ </message> <message> <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="566"/> -@@ -860,12 +868,12 @@ +@@ -860,12 +860,12 @@ <message> <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="578"/> <source>Sports non-event</source> @@ -198,7 +186,7 @@ </message> <message> <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="584"/> -@@ -875,7 +883,7 @@ +@@ -875,7 +875,7 @@ <message> <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="590"/> <source>Track/field</source> @@ -207,7 +195,7 @@ </message> <message> <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="596"/> -@@ -920,7 +928,7 @@ +@@ -920,7 +920,7 @@ <message> <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="616"/> <source>Arts/crafts</source> @@ -216,7 +204,7 @@ </message> <message> <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="618"/> -@@ -930,12 +938,12 @@ +@@ -930,12 +930,12 @@ <message> <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="620"/> <source>Auto racing</source> @@ -231,7 +219,7 @@ </message> <message> <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="624"/> -@@ -945,7 +953,7 @@ +@@ -945,7 +945,7 @@ <message> <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="626"/> <source>Bicycle racing</source> @@ -240,7 +228,7 @@ </message> <message> <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="628"/> -@@ -965,12 +973,12 @@ +@@ -965,12 +965,12 @@ <message> <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="636"/> <source>Dog show</source> @@ -255,7 +243,7 @@ </message> <message> <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="642"/> -@@ -986,12 +994,12 @@ +@@ -986,12 +986,12 @@ <message> <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="646"/> <source>Field hockey</source> @@ -270,7 +258,7 @@ </message> <message> <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="652"/> -@@ -1001,7 +1009,7 @@ +@@ -1001,7 +1001,7 @@ <message> <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="654"/> <source>Home improvement</source> @@ -279,7 +267,7 @@ </message> <message> <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="656"/> -@@ -1011,7 +1019,7 @@ +@@ -1011,7 +1011,7 @@ <message> <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="658"/> <source>Hydroplane racing</source> @@ -288,7 +276,7 @@ </message> <message> <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="660"/> -@@ -1021,7 +1029,7 @@ +@@ -1021,7 +1021,7 @@ <message> <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="662"/> <source>Motorcycle racing</source> @@ -297,7 +285,7 @@ </message> <message> <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="664"/> -@@ -1047,7 +1055,7 @@ +@@ -1047,7 +1047,7 @@ <message> <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="674"/> <source>Pro wrestling</source> @@ -306,7 +294,7 @@ </message> <message> <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="676"/> -@@ -1092,7 +1100,7 @@ +@@ -1092,7 +1092,7 @@ <message> <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="694"/> <source>Card games</source> @@ -315,7 +303,7 @@ </message> <message> <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="696"/> -@@ -1107,12 +1115,12 @@ +@@ -1107,12 +1107,12 @@ <message> <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="702"/> <source>Mixed martial arts</source> @@ -330,7 +318,7 @@ </message> <message> <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="706"/> -@@ -1144,7 +1152,7 @@ +@@ -1144,7 +1144,7 @@ <message> <location filename="../libs/libmythtv/mpeg/dvbdescriptors.cpp" line="326"/> <source>Soap/melodrama/folkloric</source> @@ -339,7 +327,7 @@ </message> <message> <location filename="../libs/libmythtv/mpeg/dvbdescriptors.cpp" line="333"/> -@@ -1160,12 +1168,12 @@ +@@ -1160,12 +1160,12 @@ <message> <location filename="../libs/libmythtv/mpeg/dvbdescriptors.cpp" line="341"/> <source>News/weather report</source> @@ -354,7 +342,7 @@ </message> <message> <location filename="../libs/libmythtv/mpeg/dvbdescriptors.cpp" line="347"/> -@@ -1380,7 +1388,7 @@ +@@ -1380,7 +1380,7 @@ <message> <location filename="../libs/libmythtv/mpeg/dvbdescriptors.cpp" line="447"/> <source>Nature/animals/Environment</source> @@ -363,7 +351,7 @@ </message> <message> <location filename="../libs/libmythtv/mpeg/dvbdescriptors.cpp" line="449"/> -@@ -1440,7 +1448,7 @@ +@@ -1440,7 +1440,7 @@ <message> <location filename="../libs/libmythtv/mpeg/dvbdescriptors.cpp" line="473"/> <source>Advertizement/Shopping</source> @@ -372,7 +360,7 @@ </message> <message> <location filename="../libs/libmythtv/mpeg/dvbdescriptors.cpp" line="475"/> -@@ -1471,124 +1479,132 @@ +@@ -1471,124 +1471,132 @@ <context> <name>(ChannelSettings)</name> <message> @@ -537,7 +525,7 @@ </message> <message> <location filename="../libs/libmythtv/channelsettings.cpp" line="417"/> -@@ -1601,22 +1617,22 @@ +@@ -1601,22 +1609,22 @@ <translation>Value to be added to your desired frequency (in kHz) for 'fine tuning'.</translation> </message> <message> @@ -564,7 +552,7 @@ <source>Channel Options - Raw Transport Stream</source> <translation>Channel Options - Raw Transport Stream</translation> </message> -@@ -1624,39 +1640,37 @@ +@@ -1624,39 +1632,37 @@ <context> <name>(Common)</name> <message> @@ -617,7 +605,7 @@ <source>Cancel</source> <translation>Cancel</translation> </message> -@@ -1699,7 +1713,7 @@ +@@ -1699,7 +1705,7 @@ <message numerus="yes"> <location filename="../libs/libmythmetadata/metadatacommon.cpp" line="481"/> <location filename="../libs/libmythmetadata/metadatacommon.cpp" line="493"/> @@ -626,7 +614,7 @@ <source>%n second(s)</source> <translation> <numerusform>%n second</numerusform> -@@ -1724,31 +1738,29 @@ +@@ -1724,31 +1730,29 @@ <translation>No</translation> </message> <message> @@ -665,7 +653,7 @@ <source>Channel Name</source> <translation>Channel Name</translation> </message> -@@ -1758,51 +1770,56 @@ +@@ -1758,65 +1762,70 @@ <translation>Channel Number</translation> </message> <message> @@ -726,14 +714,32 @@ <translation>Hue</translation> </message> <message> - <location filename="../libs/libmythtv/recorders/dvbsignalmonitor.cpp" line="51"/> +- <location filename="../libs/libmythtv/recorders/dvbsignalmonitor.cpp" line="51"/> ++ <location filename="../libs/libmythtv/recorders/dvbsignalmonitor.cpp" line="52"/> <source>Signal To Noise</source> - <translation>Signal To Noise</translation> + <translation>Signal to Noise</translation> </message> <message> - <location filename="../libs/libmythtv/recorders/signalmonitor.cpp" line="222"/> -@@ -1842,81 +1859,75 @@ +- <location filename="../libs/libmythtv/recorders/signalmonitor.cpp" line="222"/> ++ <location filename="../libs/libmythtv/recorders/signalmonitor.cpp" line="235"/> + <location filename="../libs/libmythtv/signalmonitorvalue.cpp" line="28"/> + <source>Signal Lock</source> + <translation>Signal Lock</translation> + </message> + <message> +- <location filename="../libs/libmythtv/recorders/signalmonitor.cpp" line="224"/> ++ <location filename="../libs/libmythtv/recorders/signalmonitor.cpp" line="237"/> + <source>Signal Power</source> + <translation>Signal Power</translation> + </message> + <message> +- <location filename="../libs/libmythtv/recorders/signalmonitor.cpp" line="226"/> ++ <location filename="../libs/libmythtv/recorders/signalmonitor.cpp" line="239"/> + <source>Script Status</source> + <translation>Script Status</translation> + </message> +@@ -1842,81 +1851,75 @@ <translation>MythTV</translation> </message> <message> @@ -831,7 +837,7 @@ <source>There are no configured tuners.</source> <translation>There are no configured tuners.</translation> </message> -@@ -2061,7 +2072,7 @@ +@@ -2061,7 +2064,7 @@ <message> <location filename="../libs/libmythtv/channelscan/modulationsetting.h" line="56"/> <location filename="../libs/libmythtv/channelscan/modulationsetting.h" line="89"/> @@ -840,7 +846,7 @@ <source>Modulation</source> <translation>Modulation</translation> </message> -@@ -2076,17 +2087,17 @@ +@@ -2076,17 +2079,17 @@ <translation>Modulation (Default: Auto)</translation> </message> <message> @@ -861,7 +867,7 @@ <source>Modulation, QPSK, 8PSK, QAM-16. Most DVB-S transponders use QPSK, while DVB-S2 use 8PSK. QAM-16 is not available for DVB-S2 transports.</source> <translation>Modulation, QPSK, 8PSK, QAM-16. Most DVB-S transponders use QPSK, while DVB-S2 use 8PSK. QAM-16 is not available for DVB-S2 transports.</translation> </message> -@@ -2094,32 +2105,32 @@ +@@ -2094,32 +2097,32 @@ <context> <name>(MythFrontendMain)</name> <message> @@ -902,7 +908,7 @@ <source>MythTV Frontend</source> <comment>Main window title</comment> <translation>MythTV Frontend</translation> -@@ -2180,7 +2191,7 @@ +@@ -2180,7 +2183,7 @@ <message> <location filename="../libs/libmythbase/storagegroup.cpp" line="35"/> <source>MusicArt</source> @@ -911,7 +917,7 @@ </message> </context> <context> -@@ -2215,48 +2226,48 @@ +@@ -2215,48 +2218,48 @@ <context> <name>(mythcommflag)</name> <message> @@ -976,7 +982,7 @@ </message> <message> <location filename="../programs/mythcommflag/main.cpp" line="420"/> -@@ -2274,7 +2285,7 @@ +@@ -2274,7 +2277,7 @@ <location filename="../programs/mythcommflag/main.cpp" line="1211"/> <source>Failed with exit status %1</source> <comment>Job status</comment> @@ -985,7 +991,7 @@ </message> <message numerus="yes"> <location filename="../programs/mythcommflag/main.cpp" line="1217"/> -@@ -2282,347 +2293,357 @@ +@@ -2282,347 +2285,357 @@ <source>%n commercial break(s)</source> <comment>Job status</comment> <translation> @@ -1000,13 +1006,13 @@ <name>ASIConfigurationGroup</name> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="1963"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="1978"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="1981"/> <source>Not a valid DVEO ASI card</source> <translation>Not a valid DVEO ASI card</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="1968"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="1983"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="1986"/> <source>Valid DVEO ASI card</source> - <translation>Valid DVEO ASI card</translation> + <translation>Valid DVEO ASI Card</translation> @@ -1446,7 +1452,7 @@ <source>Localization</source> <translation>Localization</translation> </message> -@@ -2630,350 +2651,491 @@ +@@ -2630,350 +2643,491 @@ <context> <name>AudioAdvancedSettings</name> <message> @@ -1738,7 +1744,8 @@ - <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="510"/> + <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="484"/> <source>Enable if your amplifier or sound decoder supports DTS. You must use a digital connection. Uncheck if using an analog connection</source> - <translation>Enable if your amplifier or sound decoder supports DTS. You must use a digital connection. Uncheck if using an analog connection</translation> +- <translation>Enable if your amplifier or sound decoder supports DTS. You must use a digital connection. Uncheck if using an analog connection</translation> ++ <translation>Enable if your amplifier or sound decoder supports DTS. You must use a digital connection. Uncheck if using an analog connection.</translation> </message> <message> - <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="520"/> @@ -2048,7 +2055,7 @@ </message> </context> <context> -@@ -2981,29 +3143,29 @@ +@@ -2981,29 +3135,29 @@ <message> <location filename="../libs/libmyth/audio/audiooutput.cpp" line="325"/> <source>Invalid or unuseable audio device</source> @@ -2083,7 +2090,7 @@ </message> <message> <location filename="../libs/libmyth/audio/audiooutput.cpp" line="476"/> -@@ -3013,7 +3175,7 @@ +@@ -3013,7 +3167,7 @@ <message> <location filename="../libs/libmyth/audio/audiooutput.cpp" line="507"/> <source>CoreAudio default output</source> @@ -2092,34 +2099,34 @@ </message> <message> <location filename="../libs/libmyth/audio/audiooutput.cpp" line="556"/> -@@ -3072,22 +3234,22 @@ +@@ -3072,22 +3226,22 @@ <message> <location filename="../libs/libmyth/audio/audiooutputjack.cpp" line="181"/> <source>Error while registering new jack port: %1</source> - <translation>Error while registering new jack port: %1</translation> -+ <translation>ERROR: While registering new jack port: %1</translation> ++ <translation>ERROR: Registering new jack port: %1</translation> </message> <message> <location filename="../libs/libmyth/audio/audiooutputjack.cpp" line="202"/> <source>Error. Unable to set process callback?!</source> - <translation>Error. Unable to set process callback?!</translation> -+ <translation>ERROR: Unable to set process callback?!</translation> ++ <translation>ERROR: Unable to set process callback!</translation> </message> <message> <location filename="../libs/libmyth/audio/audiooutputjack.cpp" line="204"/> <source>Error. Unable to set xrun callback?!</source> - <translation>Error. Unable to set xrun callback?!</translation> -+ <translation>ERROR: Unable to set xrun callback?!</translation> ++ <translation>ERROR: Unable to set xrun callback!</translation> </message> <message> <location filename="../libs/libmyth/audio/audiooutputjack.cpp" line="206"/> <source>Error. Unable to set graph order change callback?!</source> - <translation>Error. Unable to set graph order change callback?!</translation> -+ <translation>ERROR: Unable to set graph order change callback?!</translation> ++ <translation>ERROR: Unable to set graph order change callback!</translation> </message> <message> <location filename="../libs/libmyth/audio/audiooutputjack.cpp" line="211"/> -@@ -3103,7 +3265,7 @@ +@@ -3103,7 +3257,7 @@ <message> <location filename="../libs/libmyth/audio/audiooutputjack.cpp" line="634"/> <source>Error closing Jack output device. Error: %1</source> @@ -2128,7 +2135,7 @@ </message> </context> <context> -@@ -3129,7 +3291,7 @@ +@@ -3129,7 +3283,7 @@ <message> <location filename="../programs/mythfrontend/setupwizard_audio.cpp" line="94"/> <source>Select from one of the audio devices detected on your system. When satisfied, you can test audio before moving on. If you fail to configure audio, video playback may fail as well.</source> @@ -2137,7 +2144,7 @@ </message> <message> <location filename="../programs/mythfrontend/setupwizard_audio.cpp" line="99"/> -@@ -3139,27 +3301,27 @@ +@@ -3139,27 +3293,27 @@ <message> <location filename="../programs/mythfrontend/setupwizard_audio.cpp" line="103"/> <source>Select this checkbox if your receiver is capable of playing DTS.</source> @@ -2170,7 +2177,7 @@ </message> <message> <location filename="../programs/mythfrontend/setupwizard_audio.cpp" line="115"/> -@@ -3185,10 +3347,10 @@ +@@ -3185,10 +3339,10 @@ <message> <location filename="../programs/mythfrontend/setupwizard_audio.cpp" line="128"/> <source>Discovering audio devices...</source> @@ -2183,7 +2190,7 @@ <source>Stop Speaker Test</source> <translation>Stop Speaker Test</translation> </message> -@@ -3196,88 +3358,130 @@ +@@ -3196,88 +3350,130 @@ <context> <name>AudioTest</name> <message> @@ -2337,7 +2344,7 @@ <source>Audio device is invalid or not useable.</source> <translation>Audio device is invalid or not useable.</translation> </message> -@@ -3285,7 +3489,7 @@ +@@ -3285,7 +3481,7 @@ <context> <name>AudioTestThread</name> <message> @@ -2346,7 +2353,7 @@ <source>Unable to create AudioOutput.</source> <translation>Unable to create AudioOutput.</translation> </message> -@@ -3293,7 +3497,7 @@ +@@ -3293,7 +3489,7 @@ <context> <name>BDInfo</name> <message> @@ -2355,7 +2362,7 @@ <source>Could not open Blu-ray device: %1</source> <translation>Could not open Blu-ray device: %1</translation> </message> -@@ -3301,29 +3505,29 @@ +@@ -3301,29 +3497,29 @@ <context> <name>BDRingBuffer</name> <message> @@ -2394,34 +2401,41 @@ </message> </context> <context> -@@ -3336,159 +3540,162 @@ +@@ -3336,159 +3532,172 @@ <message> <location filename="../libs/libmyth/backendselect.cpp" line="358"/> <source>Please enter the backend access PIN</source> - <translation>Please enter the backend access PIN</translation> + <translation>Please enter the backend access PIN:</translation> ++ </message> ++</context> ++<context> ++ <name>BackendSettings</name> ++ <message> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="129"/> ++ <source>Listen on All IP Addresses</source> ++ <translation>Listen on All IP Addresses</translation> ++ </message> ++ <message> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="131"/> ++ <source>Allow this backend to receive connections on any IP Address assigned to it. Recommended for most users for ease and reliability.</source> ++ <translation>Allow this backend to receive connections on any IP Address assigned to it. Recommended for most users for ease and reliability.</translation> ++ </message> ++ <message> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="884"/> ++ <source>Host Address Backend Setup</source> ++ <translation>Host Address Backend Setup</translation> </message> </context> <context> -- <name>BookmarkDialog</name> -+ <name>BackendSettings</name> + <name>BookmarkDialog</name> <message> - <location filename="../programs/mythfrontend/main.cpp" line="205"/> -- <source>DVD/Video contains a bookmark</source> -- <translation>DVD/Video contains a bookmark</translation> -- </message> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="883"/> -+ <source>Host Address Backend Setup</source> -+ <translation>Host Address Backend Setup</translation> -+ </message> -+</context> -+<context> -+ <name>BookmarkDialog</name> -+ <message> + <location filename="../programs/mythfrontend/main.cpp" line="213"/> -+ <source>DVD/Video contains a bookmark</source> + <source>DVD/Video contains a bookmark</source> +- <translation>DVD/Video contains a bookmark</translation> + <translation>DVD/Video Contains a Bookmark</translation> -+ </message> + </message> <message> - <location filename="../programs/mythfrontend/main.cpp" line="206"/> + <location filename="../programs/mythfrontend/main.cpp" line="214"/> @@ -2441,19 +2455,20 @@ <name>CaptureCardEditor</name> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="3752"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="3741"/> +- <source>Capture cards</source> +- <translation>Capture cards</translation> ++ <location filename="../libs/libmythtv/videosource.cpp" line="3751"/> + <source>New capture card</source> + <translation>New Capture Card</translation> + </message> + <message> -+ <location filename="../libs/libmythtv/videosource.cpp" line="3773"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="3783"/> + <source>Error getting list of cards for this host. Unable to delete capturecards for %1</source> + <translation>Error getting list of cards for this host. Unable to delete capture cards for %1.</translation> + </message> + <message> -+ <location filename="../libs/libmythtv/videosource.cpp" line="3790"/> - <source>Capture cards</source> -- <translation>Capture cards</translation> ++ <location filename="../libs/libmythtv/videosource.cpp" line="3800"/> ++ <source>Capture cards</source> + <translation>Capture Cards</translation> </message> <message> @@ -2476,7 +2491,7 @@ </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="3815"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="3721"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="3731"/> <source>Are you sure you want to delete ALL capture cards on %1?</source> <translation>Are you sure you want to delete ALL capture cards on %1?</translation> </message> @@ -2509,7 +2524,7 @@ </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="3850"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="3731"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="3741"/> <source>Are you sure you want to delete ALL capture cards?</source> <translation>Are you sure you want to delete ALL capture cards?</translation> </message> @@ -2530,33 +2545,33 @@ <name>CardInput</name> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="3456"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="3346"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="3356"/> <source>Scan for channels</source> - <translation>Scan for channels</translation> + <translation>Scan for Channels</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="3458"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="3380"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="3390"/> <source>Use channel scanner to find channels for this input.</source> <translation>Use channel scanner to find channels for this input.</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="3460"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="3347"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="3357"/> <source>Fetch channels from listings source</source> - <translation>Fetch channels from listings source</translation> + <translation>Fetch Channels from Listings Source</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="3462"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="3383"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="3393"/> <source>This uses the listings data source to provide the channels for this input.</source> <translation>This uses the listings data source to provide the channels for this input.</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="3464"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="3385"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="3395"/> <source>This can take a long time to run.</source> <translation>This can take a long time to run.</translation> </message> @@ -2568,7 +2583,7 @@ </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="3546"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="3473"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="3483"/> <source>Enter new group name</source> - <translation>Enter new group name</translation> + <translation>Enter group name:</translation> @@ -2582,14 +2597,14 @@ </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="3555"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="3489"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="3499"/> <source>Sorry, this Input Group name cannot be blank.</source> - <translation>Sorry, this Input Group name cannot be blank.</translation> + <translation>Sorry, the name cannot be blank.</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="3578"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="3509"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="3519"/> <source>Sorry, this Input Group name is already in use.</source> - <translation>Sorry, this Input Group name is already in use.</translation> + <translation>Sorry, this name is already in use.</translation> @@ -2599,7 +2614,7 @@ <name>CardInputEditor</name> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="3987"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="3858"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="3868"/> <source>Input connections</source> - <translation>Input connections</translation> + <translation>Input Connections</translation> @@ -2609,22 +2624,22 @@ <name>CetonConfigurationGroup</name> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="2426"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="2381"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2384"/> <source>Description</source> <translation>Description</translation> </message> -@@ -3496,141 +3703,147 @@ +@@ -3496,141 +3705,146 @@ <context> <name>CetonDeviceID</name> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="2377"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="2338"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2341"/> <source>Device ID</source> <translation>Device ID</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="2378"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="2339"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2342"/> <source>Device ID of Ceton device</source> - <translation>Device ID of Ceton device</translation> + <translation>Device ID of Ceton Tuner</translation> @@ -2649,10 +2664,9 @@ + <name>ChannelCheckBoxSetting</name> <message> - <location filename="../libs/libmythtv/channelgroupsettings.cpp" line="92"/> -+ <location filename="../programs/mythfrontend/globalsettings.cpp" line="4367"/> <source>Select/Unselect channels for this channel group</source> - <translation>Select/Unselect channels for this channel group</translation> -+ <translation>Select/Unselect Channels for this Channel Group</translation> ++ <translation type="vanished">Select channels for this channel group.</translation> </message> </context> <context> @@ -2802,7 +2816,7 @@ </message> </context> <context> -@@ -3644,87 +3857,105 @@ +@@ -3644,87 +3858,110 @@ <context> <name>ChannelGroupConfig</name> <message> @@ -2901,6 +2915,11 @@ - <translation>Default channel group to be shown in the EPG. Pressing GUIDE key will toggle channel group.</translation> + <translation>Default channel group to be shown in the EPG. Pressing GUIDE key will toggle channel group.</translation> + </message> ++ <message> ++ <location filename="../programs/mythfrontend/globalsettings.cpp" line="4367"/> ++ <source>Select/Unselect channels for this channel group</source> ++ <translation>Select channels for this channel group.</translation> ++ </message> +</context> +<context> + <name>ChannelGroupsSetting</name> @@ -2939,7 +2958,7 @@ <source>Channel Importer</source> <translation>Channel Importer</translation> </message> -@@ -3732,8 +3963,8 @@ +@@ -3732,8 +3969,8 @@ <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="49"/> <source>Found %n channel(s)</source> <translation> @@ -2950,7 +2969,7 @@ </translation> </message> <message> -@@ -3800,7 +4031,7 @@ +@@ -3800,7 +4037,7 @@ </translation> </message> <message numerus="yes"> @@ -2959,7 +2978,7 @@ <source>Found %n transport(s): </source> <extracomment>%n is the number of transports</extracomment> -@@ -3812,148 +4043,159 @@ +@@ -3812,148 +4049,159 @@ </translation> </message> <message> @@ -3171,7 +3190,7 @@ <source>Please enter a non-conflicting channel number (or type '%1' to skip, '%2' to skip all): </source> <extracomment>%1 is the translation of "cancel", %2 of "cancel all"</extracomment> <translation>Please enter a non-conflicting channel number (or type '%1' to skip, '%2' to skip all): </translation> -@@ -3978,32 +4220,32 @@ +@@ -3978,32 +4226,32 @@ <location filename="../libs/libmythtv/channelscan/channelscanner.cpp" line="192"/> <location filename="../libs/libmythtv/channelscan/channelscanner.cpp" line="225"/> <source>Error tuning to transport</source> @@ -3210,7 +3229,7 @@ </message> <message> <location filename="../libs/libmythtv/channelscan/channelscanner.cpp" line="375"/> -@@ -4013,7 +4255,7 @@ +@@ -4013,7 +4261,7 @@ <message> <location filename="../libs/libmythtv/channelscan/channelscanner.cpp" line="454"/> <source>Programmer Error: Channel not created</source> @@ -3219,7 +3238,7 @@ </message> <message> <location filename="../libs/libmythtv/channelscan/channelscanner.cpp" line="465"/> -@@ -4024,72 +4266,80 @@ +@@ -4024,72 +4272,80 @@ <context> <name>ChannelScannerGUI</name> <message> @@ -3323,7 +3342,7 @@ </message> </context> <context> -@@ -4104,7 +4354,7 @@ +@@ -4104,7 +4360,7 @@ <context> <name>ChannelWizard</name> <message> @@ -3332,7 +3351,7 @@ <source>Channel Options</source> <translation>Channel Options</translation> </message> -@@ -4116,7 +4366,7 @@ +@@ -4116,7 +4372,7 @@ <location filename="../libs/libmythtv/commbreakmap.cpp" line="368"/> <source>Skip %1</source> <extracomment>%1 is the skip time</extracomment> @@ -3341,7 +3360,7 @@ </message> <message> <location filename="../libs/libmythtv/commbreakmap.cpp" line="241"/> -@@ -4127,19 +4377,19 @@ +@@ -4127,19 +4383,19 @@ <message> <location filename="../libs/libmythtv/commbreakmap.cpp" line="272"/> <source>Skipping Back.</source> @@ -3364,7 +3383,7 @@ </message> <message> <location filename="../libs/libmythtv/commbreakmap.cpp" line="362"/> -@@ -4163,124 +4413,124 @@ +@@ -4163,124 +4419,124 @@ <message> <location filename="../programs/mythfrontend/customedit.cpp" line="129"/> <source><New rule></source> @@ -3513,7 +3532,7 @@ </message> <message> <location filename="../programs/mythfrontend/customedit.cpp" line="783"/> -@@ -4290,82 +4540,82 @@ +@@ -4290,82 +4546,82 @@ <message> <location filename="../programs/mythfrontend/customedit.cpp" line="787"/> <source>Power Search rules cannot include semicolon ( ; ) </source> @@ -3612,41 +3631,41 @@ </message> <message> <location filename="../programs/mythfrontend/customedit.cpp" line="507"/> -@@ -4375,7 +4625,7 @@ +@@ -4375,7 +4631,7 @@ <message> <location filename="../programs/mythfrontend/customedit.cpp" line="517"/> <source>Multiple sports teams (complete example)</source> - <translation>Multiple sports teams (complete example)</translation> -+ <translation>MultipleSports Teams (complete example)</translation> ++ <translation>Multiple Sports Teams (complete example)</translation> </message> <message> <location filename="../programs/mythfrontend/customedit.cpp" line="525"/> -@@ -4590,29 +4840,28 @@ +@@ -4590,52 +4846,51 @@ <context> <name>DVBConfigurationGroup</name> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="4124"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="3976"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="3986"/> <source>Could not open card %1</source> - <translation>Could not open card %1</translation> + <translation>Could Not Open Card %1</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="4125"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="3977"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="3987"/> <source>Could not get card info for card %1</source> - <translation>Could not get card info for card %1</translation> + <translation>Could Not Get Card Info for %1</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="4330"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="4149"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="4159"/> <source>DiSEqC (Switch, LNB, and Rotor Configuration)</source> <translation>DiSEqC (Switch, LNB, and Rotor Configuration)</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="4331"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="4150"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="4160"/> <source>Input and satellite settings.</source> <translation>Input and satellite settings.</translation> </message> @@ -3658,16 +3677,35 @@ </message> </context> <context> -@@ -4635,7 +4884,7 @@ + <name>DVBSignalMonitor</name> <message> - <location filename="../libs/libmythtv/recorders/dvbsignalmonitor.cpp" line="224"/> +- <location filename="../libs/libmythtv/recorders/dvbsignalmonitor.cpp" line="54"/> ++ <location filename="../libs/libmythtv/recorders/dvbsignalmonitor.cpp" line="55"/> + <source>Bit Error Rate</source> + <translation>Bit Error Rate</translation> + </message> + <message> +- <location filename="../libs/libmythtv/recorders/dvbsignalmonitor.cpp" line="56"/> ++ <location filename="../libs/libmythtv/recorders/dvbsignalmonitor.cpp" line="57"/> + <source>Uncorrected Blocks</source> + <translation>Uncorrected Blocks</translation> + </message> + <message> +- <location filename="../libs/libmythtv/recorders/dvbsignalmonitor.cpp" line="58"/> ++ <location filename="../libs/libmythtv/recorders/dvbsignalmonitor.cpp" line="59"/> + <source>Rotor Progress</source> + <translation>Rotor Progress</translation> + </message> + <message> +- <location filename="../libs/libmythtv/recorders/dvbsignalmonitor.cpp" line="224"/> ++ <location filename="../libs/libmythtv/recorders/dvbsignalmonitor.cpp" line="225"/> <source>Error: stream handler died</source> - <translation>Error: stream handler died</translation> + <translation>Error: Stream Handler Died</translation> </message> </context> <context> -@@ -4643,7 +4892,7 @@ +@@ -4643,7 +4898,7 @@ <message> <location filename="../libs/libmythtv/DVD/dvdringbuffer.cpp" line="63"/> <source>Failed to open device at %1</source> @@ -3676,7 +3714,7 @@ </message> </context> <context> -@@ -4651,227 +4900,238 @@ +@@ -4651,227 +4906,238 @@ <message> <location filename="../libs/libmythtv/DVD/dvdringbuffer.cpp" line="474"/> <source>Title %1 chapter %2</source> @@ -3709,12 +3747,12 @@ + <message> + <location filename="../libs/libmythtv/videosource.cpp" line="532"/> + <source>Fetching of lineups failed</source> -+ <translation>Fetching of Lineups Failed</translation> ++ <translation>Fetching Lineups Failed</translation> + </message> + <message> + <location filename="../libs/libmythtv/videosource.cpp" line="546"/> + <source>Fetching of lineups complete</source> -+ <translation>Fetching of Lineups Complete</translation> ++ <translation>Fetching Lineups Complete</translation> </message> </context> <context> @@ -3988,7 +4026,7 @@ </message> </context> <context> -@@ -4879,12 +5139,12 @@ +@@ -4879,12 +5145,12 @@ <message> <location filename="../libs/libmythtv/deletemap.cpp" line="82"/> <source>(Nothing to undo)</source> @@ -4003,7 +4041,7 @@ </message> <message> <location filename="../libs/libmythtv/deletemap.cpp" line="99"/> -@@ -4903,7 +5163,7 @@ +@@ -4903,7 +5169,7 @@ </message> <message> <location filename="../libs/libmythtv/deletemap.cpp" line="124"/> @@ -4012,7 +4050,7 @@ <source>Delete</source> <extracomment>Delete the current cut or preserved region</extracomment> <translation>Delete</translation> -@@ -4975,35 +5235,35 @@ +@@ -4975,35 +5241,35 @@ <translation>Reverse Cuts</translation> </message> <message> @@ -4056,7 +4094,7 @@ <source>If enabled, move deleted recordings to the 'Deleted' recgroup and turn on autoexpire instead of deleting immediately.</source> <translation>If enabled, move deleted recordings to the 'Deleted' recgroup and turn on autoexpire instead of deleting immediately.</translation> </message> -@@ -5011,256 +5271,258 @@ +@@ -5011,256 +5277,258 @@ <context> <name>DemoConfigurationGroup</name> <message> @@ -4064,42 +4102,42 @@ <source>A local MPEG file used to simulate a recording. Must be entered as file:/path/movie.mpg</source> - <translation>A local MPEG file used to simulate a recording. Must be entered as file:/path/movie.mpg</translation> + <translation type="vanished">A local MPEG file used to simulate a recording. Must be entered as file:/path/movie.mpg</translation> -+ </message> -+ <message> -+ <location filename="../libs/libmythtv/videosource.cpp" line="2505"/> -+ <source>A local MPEG file used to simulate a recording.</source> -+ <translation></translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="2560"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="2512"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2508"/> ++ <source>A local MPEG file used to simulate a recording.</source> ++ <translation>A local MPEG file used to simulate a recording.</translation> ++ </message> ++ <message> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2515"/> <source>File info</source> - <translation>File info</translation> + <translation>File Info</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="2563"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="2516"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2519"/> <source>File size</source> - <translation>File size</translation> + <translation>File Size</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="2589"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="2535"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2538"/> <source>%1 MB</source> <translation>%1 MB</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="2592"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="2538"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2541"/> <source>File not readable</source> - <translation>File not readable</translation> + <translation>File Not Readable</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="2596"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="2542"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2545"/> <source>File does not exist</source> - <translation>File does not exist</translation> + <translation>File Does Not Exist</translation> @@ -4379,7 +4417,7 @@ <source>Universal (Europe)</source> <translation>Universal (Europe)</translation> </message> -@@ -5275,128 +5537,132 @@ +@@ -5275,128 +5543,132 @@ <translation>The Cartesian longitude for your location. Use negative numbers for western coordinates.</translation> </message> <message> @@ -4539,7 +4577,7 @@ <source>This defines the offset the frequency coming from the LNB will be in low setting. For bandstacked LNBs this is the vertical/right polarization band.</source> <translation>This defines the offset the frequency coming from the LNB will be in low setting. For bandstacked LNBs this is the vertical/right polarization band.</translation> </message> -@@ -5411,77 +5677,75 @@ +@@ -5411,77 +5683,75 @@ <translation>This defines the offset the frequency coming from the LNB will be in high setting. For bandstacked LNBs this is the horizontal/left polarization band.</translation> </message> <message> @@ -4632,7 +4670,7 @@ <source>DTV Device Configuration</source> <translation>DTV Device Configuration</translation> </message> -@@ -5489,29 +5753,33 @@ +@@ -5489,29 +5759,33 @@ <context> <name>EPGSettings</name> <message> @@ -4674,7 +4712,7 @@ </message> </context> <context> -@@ -5529,12 +5797,12 @@ +@@ -5529,12 +5803,12 @@ <message> <location filename="../programs/mythfrontend/editvideometadata.cpp" line="500"/> <source>Enter new category</source> @@ -4689,7 +4727,7 @@ </message> <message> <location filename="../programs/mythfrontend/editvideometadata.cpp" line="663"/> -@@ -5545,22 +5813,22 @@ +@@ -5545,22 +5819,22 @@ <message> <location filename="../programs/mythfrontend/editvideometadata.cpp" line="682"/> <source>Downloading selected artwork...</source> @@ -4716,7 +4754,7 @@ </message> </context> <context> -@@ -5611,7 +5879,7 @@ +@@ -5611,7 +5885,7 @@ <message> <location filename="../programs/mythfrontend/exitprompt.cpp" line="227"/> <source>Yes, Exit now</source> @@ -4725,7 +4763,7 @@ </message> <message> <location filename="../programs/mythfrontend/exitprompt.cpp" line="229"/> -@@ -5644,12 +5912,12 @@ +@@ -5644,12 +5918,12 @@ <message> <location filename="../programs/mythtv-setup/exitprompt.cpp" line="85"/> <source>Yes please</source> @@ -4740,48 +4778,70 @@ </message> </context> <context> -@@ -5668,32 +5936,32 @@ +@@ -5668,34 +5942,51 @@ <context> <name>ExternalConfigurationGroup</name> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="2611"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="2557"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2560"/> ++ <source>Command path</source> ++ <translation>Command Path</translation> ++ </message> ++ <message> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2561"/> <source>A 'black box' application controlled via stdin, status on stderr and TransportStream read from stdout</source> - <translation>A 'black box' application controlled via stdin, status on stderr and TransportStream read from stdout</translation> + <translation>A 'black box' application controlled via stdin, status on stderr and TransportStream read from stdout.</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="2616"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="2562"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2566"/> <source>File info</source> - <translation>File info</translation> + <translation>File Info</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="2638"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="2582"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2589"/> <source>'%1' is valid.</source> <translation>'%1' is valid.</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="2640"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="2584"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2591"/> ++ <source>WARNING: '%1' is not readable.</source> ++ <translation>WARNING: '%1' is not readable.</translation> ++ </message> ++ <message> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2594"/> ++ <source>WARNING: '%1' is not executable.</source> ++ <translation>WARNING: '%1' is not executable.</translation> ++ </message> ++ <message> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2599"/> ++ <source>WARNING: '%1' does not exist.</source> ++ <translation>WARNING: '%1' does not exist.</translation> ++ </message> ++ <message> <source>'%1' is not readable.</source> - <translation>'%1' is not readable.</translation> +- <translation>'%1' is not readable.</translation> ++ <translation type="vanished">'%1' is not readable.</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="2642"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="2586"/> <source>'%1' is not executable.</source> - <translation>'%1' is not executable.</translation> +- <translation>'%1' is not executable.</translation> ++ <translation type="vanished">'%1' is not executable.</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="2646"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="2590"/> <source>'%1' does not exist.</source> - <translation>'%1' does not exist.</translation> +- <translation>'%1' does not exist.</translation> ++ <translation type="vanished">'%1' does not exist.</translation> </message> -@@ -5708,22 +5976,22 @@ + </context> + <context> +@@ -5708,22 +5999,22 @@ <message> <location filename="../programs/mythfrontend/videofileassoc.cpp" line="375"/> <source>The command to use when playing this kind of file. To use MythTV's Internal player, use "Internal" as the player. For all other players, you can use %s to substitute the filename.</source> @@ -4808,7 +4868,7 @@ </message> <message> <location filename="../programs/mythfrontend/videofileassoc.cpp" line="384"/> -@@ -5738,7 +6006,7 @@ +@@ -5738,7 +6029,7 @@ <message> <location filename="../programs/mythfrontend/videofileassoc.cpp" line="444"/> <source>Enter the new extension:</source> @@ -4817,7 +4877,7 @@ </message> </context> <context> -@@ -5747,45 +6015,45 @@ +@@ -5747,45 +6038,45 @@ <location filename="../libs/libmythtv/fileringbuffer.cpp" line="304"/> <source>Could not open %1</source> <extracomment>%1 is the filename</extracomment> @@ -4844,7 +4904,8 @@ + <translation>Cannot Seek in File</translation> </message> <message> - <location filename="../libs/libmythtv/fileringbuffer.cpp" line="374"/> +- <location filename="../libs/libmythtv/fileringbuffer.cpp" line="374"/> ++ <location filename="../libs/libmythtv/fileringbuffer.cpp" line="376"/> <source>Failed to open remote file %1</source> <extracomment>%1 is the filename</extracomment> - <translation>Failed to open remote file %1</translation> @@ -4871,12 +4932,12 @@ <source>Complete</source> <translation>Complete</translation> </message> -@@ -5793,15 +6061,88 @@ +@@ -5793,15 +6084,88 @@ <context> <name>FirewireDesc</name> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="1255"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="1294"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="1297"/> <source>Description</source> <translation>Description</translation> </message> @@ -4951,7 +5012,7 @@ + <message> + <location filename="../programs/mythfrontend/galleryconfig.cpp" line="214"/> + <source>Warning! This will erase settings for: hidden images, directory covers and re-orientations. You will have to set them again after re-scanning.</source> -+ <translation>Warning! This will erase settings for: hidden images, directory covers and re-orientations. You will have to set them again after re-scanning.</translation> ++ <translation>Warning! This will erase settings for hidden images, directory covers, and re-orientations. You will have to set them again after re-scanning.</translation> + </message> +</context> +<context> @@ -4962,7 +5023,7 @@ <source>Gallery Settings</source> <translation>Gallery Settings</translation> </message> -@@ -5809,135 +6150,135 @@ +@@ -5809,135 +6173,135 @@ <context> <name>GallerySlideView</name> <message> @@ -5126,7 +5187,7 @@ </message> <message> <location filename="../programs/mythfrontend/galleryslideview.cpp" line="654"/> -@@ -5950,7 +6291,7 @@ +@@ -5950,7 +6314,7 @@ <translation>Start</translation> </message> <message> @@ -5135,7 +5196,7 @@ <source>End</source> <extracomment>Slideshow has reached last slide</extracomment> <translation>End</translation> -@@ -5959,12 +6300,12 @@ +@@ -5959,12 +6323,12 @@ <context> <name>GalleryThumbView</name> <message> @@ -5150,7 +5211,7 @@ <source>No images found. Scan storage group using menu, or insert/mount local media. -@@ -5975,477 +6316,477 @@ +@@ -5975,477 +6339,477 @@ </translation> </message> <message> @@ -5746,7 +5807,7 @@ <source>Import command failed. Error: %1</source> <translation>Import command failed. -@@ -6455,117 +6796,117 @@ +@@ -6455,117 +6819,117 @@ <context> <name>GeneralRecPrioritiesSettings</name> <message> @@ -5895,7 +5956,7 @@ <source>Accessibility Options</source> <translation>Accessibility Options</translation> </message> -@@ -6573,270 +6914,271 @@ +@@ -6573,270 +6937,271 @@ <context> <name>GeneralSettings</name> <message> @@ -6250,7 +6311,7 @@ <source>General (Channel Groups)</source> <translation>General (Channel Groups)</translation> </message> -@@ -6866,7 +7208,7 @@ +@@ -6866,7 +7231,7 @@ <message> <location filename="../programs/mythfrontend/setupwizard_general.cpp" line="66"/> <source>Exit this wizard, save no changes.</source> @@ -6259,7 +6320,7 @@ </message> <message> <location filename="../programs/mythfrontend/setupwizard_general.cpp" line="133"/> -@@ -6876,7 +7218,7 @@ +@@ -6876,7 +7241,7 @@ <message> <location filename="../programs/mythfrontend/setupwizard_general.cpp" line="151"/> <source>Submitting your hardware profile...</source> @@ -6268,7 +6329,7 @@ </message> <message> <location filename="../programs/mythfrontend/setupwizard_general.cpp" line="159"/> -@@ -6911,7 +7253,7 @@ +@@ -6911,7 +7276,7 @@ <message> <location filename="../programs/mythfrontend/setupwizard_general.cpp" line="253"/> <source>Deleting your hardware profile...</source> @@ -6277,7 +6338,7 @@ </message> <message> <location filename="../programs/mythfrontend/setupwizard_general.cpp" line="261"/> -@@ -6944,12 +7286,12 @@ +@@ -6944,12 +7309,12 @@ <message> <location filename="../programs/mythfrontend/grabbersettings.cpp" line="62"/> <source>Save your changes and close this window.</source> @@ -6292,7 +6353,7 @@ </message> <message> <location filename="../programs/mythfrontend/grabbersettings.cpp" line="65"/> -@@ -6959,159 +7301,159 @@ +@@ -6959,159 +7324,159 @@ <message> <location filename="../programs/mythfrontend/grabbersettings.cpp" line="76"/> <source>Searching for data sources...</source> @@ -6500,33 +6561,33 @@ <source>Delete '%1' %2 rule?</source> <translation>Delete '%1' %2 rule?</translation> </message> -@@ -7119,12 +7461,12 @@ +@@ -7119,12 +7484,12 @@ <context> <name>HDHomeRunConfigurationGroup</name> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="2067"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="2074"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2077"/> <source>Description</source> <translation>Description</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="2082"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="2089"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2092"/> <source>Recording Options</source> <translation>Recording Options</translation> </message> -@@ -7132,22 +7474,22 @@ +@@ -7132,22 +7497,22 @@ <context> <name>HDHomeRunDeviceID</name> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="1415"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="1441"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="1444"/> <source>Device ID</source> <translation>Device ID</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="1416"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="1442"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="1445"/> <source>Device ID of HDHomeRun device</source> - <translation>Device ID of HDHomeRun device</translation> + <translation>Device ID of HDHomeRun Device</translation> @@ -6538,32 +6599,32 @@ - <location filename="../libs/libmythtv/videosource.cpp" line="1509"/> - <location filename="../libs/libmythtv/videosource.cpp" line="1565"/> - <location filename="../libs/libmythtv/videosource.cpp" line="1575"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="1538"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="1596"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="1606"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="1541"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="1599"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="1609"/> <source>Manually Enter IP Address</source> <translation>Manually Enter IP Address</translation> </message> -@@ -7155,122 +7497,122 @@ +@@ -7155,122 +7520,122 @@ <context> <name>HDPVRConfigurationGroup</name> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="2662"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="2608"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2618"/> <source>Probed info</source> - <translation>Probed info</translation> + <translation>Probed Info</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="2679"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="2626"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2636"/> <source>Failed to open</source> - <translation>Failed to open</translation> + <translation>Failed to Open</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="2685"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="2632"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2642"/> <source>Failed to probe</source> - <translation>Failed to probe</translation> + <translation>Failed to Probe</translation> @@ -6590,7 +6651,7 @@ + <location filename="../programs/mythfrontend/playbackbox.cpp" line="5549"/> <source>The program is able to auto-expire</source> - <translation>The program is able to auto-expire</translation> -+ <translation>Program Is Set to Auto-expire</translation> ++ <translation>Program is Set to Auto-expire</translation> </message> <message> - <location filename="../programs/mythfrontend/playbackbox.cpp" line="5519"/> @@ -6702,7 +6763,7 @@ </message> </context> <context> -@@ -7296,7 +7638,7 @@ +@@ -7296,7 +7661,7 @@ <message> <location filename="../html/htmlstrings.h" line="24"/> <source>Package installed</source> @@ -6711,7 +6772,7 @@ </message> <message> <location filename="../html/htmlstrings.h" line="25"/> -@@ -7747,7 +8089,7 @@ +@@ -7747,7 +8112,7 @@ <message> <location filename="../html/htmlstrings.h" line="163"/> <source>Use Link-Local</source> @@ -6720,7 +6781,7 @@ </message> <message> <location filename="../html/htmlstrings.h" line="165"/> -@@ -8060,7 +8402,7 @@ +@@ -8060,7 +8425,7 @@ <message> <location filename="../html/htmlstrings.h" line="240"/> <source>Auto-Expire</source> @@ -6729,7 +6790,7 @@ </message> <message> <location filename="../html/htmlstrings.h" line="241"/> -@@ -8080,7 +8422,7 @@ +@@ -8080,7 +8445,7 @@ <message> <location filename="../html/htmlstrings.h" line="245"/> <source>Delete and Re-Record</source> @@ -6738,7 +6799,7 @@ </message> <message> <location filename="../html/htmlstrings.h" line="246"/> -@@ -8165,7 +8507,7 @@ +@@ -8165,7 +8530,7 @@ <message> <location filename="../html/htmlstrings.h" line="272"/> <source>Allow Auto-Expire</source> @@ -6747,7 +6808,7 @@ </message> <message> <location filename="../html/htmlstrings.h" line="275"/> -@@ -8449,7 +8791,7 @@ +@@ -8449,7 +8814,7 @@ <message> <location filename="../html/htmlstrings.h" line="12"/> <source>Loading ...</source> @@ -6756,7 +6817,7 @@ </message> <message> <location filename="../html/htmlstrings.h" line="14"/> -@@ -8661,7 +9003,7 @@ +@@ -8661,7 +9026,7 @@ <message> <location filename="../libs/libmythtv/channelscan/iptvchannelfetcher.cpp" line="335"/> <source>Encountered malformed channel</source> @@ -6765,52 +6826,52 @@ </message> </context> <context> -@@ -8691,34 +9033,34 @@ +@@ -8691,34 +9056,34 @@ <context> <name>ImportConfigurationGroup</name> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="1980"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="1996"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="1999"/> <source>A local file used to simulate a recording. Leave empty to use MythEvents to trigger an external program to import recording files.</source> <translation>A local file used to simulate a recording. Leave empty to use MythEvents to trigger an external program to import recording files.</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="1988"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="2004"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2007"/> <source>File info</source> - <translation>File info</translation> + <translation>File Info</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="1991"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="2008"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2011"/> <source>File size</source> - <translation>File size</translation> + <translation>File Size</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="2014"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="2032"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2035"/> <source>%1 MB</source> <translation>%1 MB</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="2017"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="2035"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2038"/> <source>File not readable</source> - <translation>File not readable</translation> + <translation>File Not Readable</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="2021"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="2039"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2042"/> <source>File %1 does not exist</source> - <translation>File %1 does not exist</translation> + <translation>File %1 Does Not Exist</translation> </message> </context> <context> -@@ -8726,27 +9068,27 @@ +@@ -8726,27 +9091,27 @@ <message> <location filename="../programs/mythtv-setup/importicons.cpp" line="94"/> <source>Name of the icon file</source> @@ -6843,7 +6904,7 @@ </message> <message> <location filename="../programs/mythtv-setup/importicons.cpp" line="139"/> -@@ -8761,7 +9103,7 @@ +@@ -8761,7 +9126,7 @@ <message> <location filename="../programs/mythtv-setup/importicons.cpp" line="173"/> <source>No matches found for "%1"</source> @@ -6852,7 +6913,7 @@ </message> <message> <location filename="../programs/mythtv-setup/importicons.cpp" line="411"/> -@@ -8772,7 +9114,7 @@ +@@ -8772,7 +9137,7 @@ <message> <location filename="../programs/mythtv-setup/importicons.cpp" line="483"/> <source>No matches found for %1</source> @@ -6861,7 +6922,7 @@ </message> <message> <location filename="../programs/mythtv-setup/importicons.cpp" line="218"/> -@@ -8787,12 +9129,12 @@ +@@ -8787,12 +9152,12 @@ <message> <location filename="../programs/mythtv-setup/importicons.cpp" line="319"/> <source>Initializing, please wait...</source> @@ -6876,7 +6937,7 @@ </message> <message numerus="yes"> <location filename="../programs/mythtv-setup/importicons.cpp" line="423"/> -@@ -8805,20 +9147,20 @@ +@@ -8805,20 +9170,20 @@ <message> <location filename="../programs/mythtv-setup/importicons.cpp" line="479"/> <source>Choose icon for channel %1</source> @@ -6901,7 +6962,7 @@ <source>Icon choices submitted successfully.</source> <translation>Icon choices submitted successfully.</translation> </message> -@@ -8826,17 +9168,17 @@ +@@ -8826,17 +9191,17 @@ <context> <name>ImportSettings</name> <message> @@ -6922,7 +6983,7 @@ <source>Command/script that can be run from the menu. %TMPDIR% will be replaced by a new temporary directory, which the import dialog will show automatically. The directory will be removed when Gallery exits.</source> <translation>Command/script that can be run from the menu. -@@ -8877,7 +9219,7 @@ +@@ -8877,7 +9242,7 @@ <message> <location filename="../programs/mythfrontend/galleryinfo.cpp" line="168"/> <source>Dir size</source> @@ -6931,7 +6992,7 @@ </message> <message> <location filename="../programs/mythfrontend/galleryinfo.cpp" line="176"/> -@@ -8913,7 +9255,7 @@ +@@ -8913,7 +9278,7 @@ <message> <location filename="../programs/mythfrontend/galleryinfo.cpp" line="243"/> <source>Last scan</source> @@ -6940,7 +7001,7 @@ </message> <message> <location filename="../programs/mythfrontend/galleryinfo.cpp" line="251"/> -@@ -8923,7 +9265,7 @@ +@@ -8923,7 +9288,7 @@ <message> <location filename="../programs/mythfrontend/galleryinfo.cpp" line="257"/> <source>File size</source> @@ -6949,22 +7010,21 @@ </message> <message> <location filename="../programs/mythfrontend/galleryinfo.cpp" line="258"/> -@@ -8940,6 +9282,14 @@ +@@ -8940,6 +9305,13 @@ </message> </context> <context> + <name>IpAddressSettings</name> + <message> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="131"/> + <source>Allow this backend to receive connections on any IP Address assigned to it. Recommended for most users for ease and reliability.</source> -+ <translation>Allow this backend to receive connections on any IP Address assigned to it. Recommended for most users for ease and reliability.</translation> ++ <translation type="vanished">Allow this backend to receive connections on any IP Address assigned to it. Recommended for most users for ease and reliability.</translation> + </message> +</context> +<context> <name>JobQueue</name> <message> <location filename="../libs/libmythtv/jobqueue.cpp" line="1109"/> -@@ -8954,7 +9304,7 @@ +@@ -8954,7 +9326,7 @@ <message> <location filename="../libs/libmythtv/jobqueue.cpp" line="1111"/> <source>Look up Metadata</source> @@ -6973,7 +7033,7 @@ </message> <message> <location filename="../libs/libmythtv/jobqueue.cpp" line="1121"/> -@@ -8969,12 +9319,12 @@ +@@ -8969,12 +9341,12 @@ <message> <location filename="../libs/libmythtv/jobqueue.cpp" line="1678"/> <source>Unable to retrieve program info from database</source> @@ -6988,7 +7048,7 @@ </message> <message> <location filename="../libs/libmythtv/jobqueue.cpp" line="1733"/> -@@ -8989,7 +9339,7 @@ +@@ -8989,7 +9361,7 @@ <message> <location filename="../libs/libmythtv/jobqueue.cpp" line="2028"/> <source>Finished.</source> @@ -6997,7 +7057,7 @@ </message> <message> <location filename="../libs/libmythtv/jobqueue.cpp" line="2040"/> -@@ -9005,12 +9355,12 @@ +@@ -9005,12 +9377,12 @@ <message> <location filename="../libs/libmythtv/jobqueue.cpp" line="2096"/> <source>Retry limit exceeded</source> @@ -7012,7 +7072,7 @@ </message> <message> <location filename="../libs/libmythtv/jobqueue.cpp" line="2155"/> -@@ -9020,12 +9370,12 @@ +@@ -9020,12 +9392,12 @@ <message> <location filename="../libs/libmythtv/jobqueue.cpp" line="2181"/> <source>Unable to find mythmetadatalookup</source> @@ -7027,7 +7087,7 @@ </message> <message> <location filename="../libs/libmythtv/jobqueue.cpp" line="2211"/> -@@ -9036,7 +9386,7 @@ +@@ -9036,7 +9408,7 @@ <message> <location filename="../libs/libmythtv/jobqueue.cpp" line="2273"/> <source>Could not open new database connection for commercial detector.</source> @@ -7036,7 +7096,7 @@ </message> <message> <location filename="../libs/libmythtv/jobqueue.cpp" line="2280"/> -@@ -9046,7 +9396,7 @@ +@@ -9046,7 +9418,7 @@ <message> <location filename="../libs/libmythtv/jobqueue.cpp" line="2318"/> <source>Unable to find mythcommflag</source> @@ -7045,7 +7105,7 @@ </message> <message> <location filename="../libs/libmythtv/jobqueue.cpp" line="2440"/> -@@ -9061,32 +9411,32 @@ +@@ -9061,32 +9433,32 @@ <message> <location filename="../libs/libmythtv/jobqueue.cpp" line="2464"/> <source>Successfully Completed.</source> @@ -7084,7 +7144,7 @@ </translation> </message> <message> -@@ -9181,43 +9531,43 @@ +@@ -9181,43 +9553,43 @@ <message> <location filename="../programs/mythfrontend/keygrabber.cpp" line="49"/> <source>Waiting for key press</source> @@ -7136,7 +7196,7 @@ <source>RECORDING|</source> <translation>RECORDING|</translation> </message> -@@ -9227,170 +9577,169 @@ +@@ -9227,170 +9599,169 @@ <message> <location filename="../libs/libmyth/langsettings.cpp" line="76"/> <source>Preferred language</source> @@ -7352,7 +7412,7 @@ </message> </context> <context> -@@ -9405,47 +9754,46 @@ +@@ -9405,47 +9776,46 @@ <location filename="../libs/libmythmetadata/lyricsdata.cpp" line="95"/> <location filename="../libs/libmythmetadata/lyricsdata.cpp" line="230"/> <source>No lyrics found for this track</source> @@ -7364,21 +7424,21 @@ <name>MPEGConfigurationGroup</name> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="2513"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="2464"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2467"/> <source>Probed info</source> - <translation>Probed info</translation> + <translation>Probed Info</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="2528"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="2480"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2483"/> <source>Failed to open</source> - <translation>Failed to open</translation> + <translation>Failed to Open</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="2535"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="2487"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2490"/> <source>Failed to probe</source> - <translation>Failed to probe</translation> + <translation>Failed to Probe</translation> @@ -7413,7 +7473,7 @@ <source>Video on the desktop will skip this many frames for each frame drawn. Set to 0 to show every frame.</source> <translation>Video on the desktop will skip this many frames for each frame drawn. Set to 0 to show every frame.</translation> </message> -@@ -9453,23 +9801,22 @@ +@@ -9453,23 +9823,22 @@ <context> <name>MacDockSettings</name> <message> @@ -7443,7 +7503,7 @@ <source>Video in the dock icon will skip this many frames for each frame drawn. Set to 0 to show every frame.</source> <translation>Video in the dock icon will skip this many frames for each frame drawn. Set to 0 to show every frame.</translation> </message> -@@ -9477,33 +9824,32 @@ +@@ -9477,33 +9846,32 @@ <context> <name>MacFloatSettings</name> <message> @@ -7485,7 +7545,7 @@ <source>The opacity of the floating window. Set to 100 for completely opaque, set to 0 for completely transparent.</source> <translation>The opacity of the floating window. Set to 100 for completely opaque, set to 0 for completely transparent.</translation> </message> -@@ -9511,33 +9857,32 @@ +@@ -9511,33 +9879,32 @@ <context> <name>MacMainSettings</name> <message> @@ -7527,7 +7587,7 @@ <source>The opacity of the main window. Set to 100 for completely opaque, set to 0 for completely transparent.</source> <translation>The opacity of the main window. Set to 100 for completely opaque, set to 0 for completely transparent.</translation> </message> -@@ -9545,252 +9890,269 @@ +@@ -9545,252 +9912,269 @@ <context> <name>MainGeneralSettings</name> <message> @@ -7875,7 +7935,7 @@ <source>Shutdown/Reboot Settings</source> <translation>Shutdown/Reboot Settings</translation> </message> -@@ -9800,135 +10162,132 @@ +@@ -9800,135 +10184,132 @@ <message> <location filename="../programs/mythfrontend/manualschedule.cpp" line="93"/> <source>5 weekdays if daily</source> @@ -8054,7 +8114,7 @@ </message> </context> <context> -@@ -9961,12 +10320,12 @@ +@@ -9961,12 +10342,12 @@ <message> <location filename="../programs/mythfrontend/videometadatasettings.cpp" line="114"/> <source>Exit without saving settings</source> @@ -8069,7 +8129,7 @@ </message> </context> <context> -@@ -10004,7 +10363,7 @@ +@@ -10004,7 +10385,7 @@ <translation>Unknown Genre</translation> </message> <message> @@ -8078,7 +8138,7 @@ <source>Never Played</source> <translation>Never Played</translation> </message> -@@ -10014,7 +10373,7 @@ +@@ -10014,7 +10395,7 @@ <message> <location filename="../libs/libmythtv/AirPlay/mythairplayserver.cpp" line="593"/> <source>Client disconnected</source> @@ -8087,7 +8147,7 @@ </message> <message> <location filename="../libs/libmythtv/AirPlay/mythairplayserver.cpp" line="593"/> -@@ -10050,1505 +10409,1509 @@ +@@ -10050,1505 +10431,1509 @@ <context> <name>MythControls</name> <message> @@ -9147,7 +9207,7 @@ + <location filename="../libs/libmythtv/tv_play.cpp" line="953"/> <source>Toggle OSD playback information</source> - <translation>Toggle OSD playback information</translation> -+ <translation>Toggle Osd Playback Information</translation> ++ <translation>Toggle OSD Playback Information</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="955"/> @@ -9283,14 +9343,14 @@ + <location filename="../libs/libmythtv/tv_play.cpp" line="914"/> <source>Jump back 10x the normal amount</source> - <translation>Jump back 10x the normal amount</translation> -+ <translation>Jump Back 10x the Normal Amount</translation> ++ <translation>Jump Back 10x Normal</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="914"/> + <location filename="../libs/libmythtv/tv_play.cpp" line="916"/> <source>Jump forward 10x the normal amount</source> - <translation>Jump forward 10x the normal amount</translation> -+ <translation>Jump Forward 10x the Normal Amount</translation> ++ <translation>Jump Forward 10x Normal</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="920"/> @@ -9594,7 +9654,7 @@ + <location filename="../libs/libmythui/mythmainwindow.cpp" line="1321"/> <source>Turn the display on</source> - <translation>Turn the display on</translation> -+ <translation>Turn the Display on</translation> ++ <translation>Turn the Display On</translation> </message> <message> - <location filename="../libs/libmythui/mythmainwindow.cpp" line="1318"/> @@ -9668,7 +9728,7 @@ + <location filename="../libs/libmythui/mythmainwindow.cpp" line="1348"/> <source>Zoom in on browser window</source> - <translation>Zoom in on browser window</translation> -+ <translation>Zoom in on Browser Window</translation> ++ <translation>Zoom In on Browser Window</translation> </message> <message> - <location filename="../libs/libmythui/mythmainwindow.cpp" line="1345"/> @@ -9682,7 +9742,7 @@ + <location filename="../libs/libmythui/mythmainwindow.cpp" line="1352"/> <source>Toggle where keyboard input goes to</source> - <translation>Toggle where keyboard input goes to</translation> -+ <translation>Toggle Where Keyboard Input Goes to</translation> ++ <translation>Toggle Where Keyboard Input Goes To</translation> </message> <message> - <location filename="../libs/libmythui/mythmainwindow.cpp" line="1350"/> @@ -9724,28 +9784,28 @@ + <location filename="../libs/libmythui/mythmainwindow.cpp" line="1366"/> <source>Scroll down half a page</source> - <translation>Scroll down half a page</translation> -+ <translation>Scroll Down Half a Page</translation> ++ <translation>Scroll Down Half Page</translation> </message> <message> - <location filename="../libs/libmythui/mythmainwindow.cpp" line="1363"/> + <location filename="../libs/libmythui/mythmainwindow.cpp" line="1368"/> <source>Scroll up half a page</source> - <translation>Scroll up half a page</translation> -+ <translation>Scroll Up Half a Page</translation> ++ <translation>Scroll Up Half Page</translation> </message> <message> - <location filename="../libs/libmythui/mythmainwindow.cpp" line="1365"/> + <location filename="../libs/libmythui/mythmainwindow.cpp" line="1370"/> <source>Scroll left half a page</source> - <translation>Scroll left half a page</translation> -+ <translation>Scroll Left Half a Page</translation> ++ <translation>Scroll Left Half Page</translation> </message> <message> - <location filename="../libs/libmythui/mythmainwindow.cpp" line="1367"/> + <location filename="../libs/libmythui/mythmainwindow.cpp" line="1372"/> <source>Scroll right half a page</source> - <translation>Scroll right half a page</translation> -+ <translation>Scroll Right Half a Page</translation> ++ <translation>Scroll Right Half Page</translation> </message> <message> - <location filename="../libs/libmythui/mythmainwindow.cpp" line="1370"/> @@ -9991,7 +10051,7 @@ + <location filename="../programs/mythfrontend/main.cpp" line="1552"/> <source>Zoom image in</source> - <translation>Zoom image in</translation> -+ <translation>Zoom Image in</translation> ++ <translation>Zoom Image In</translation> </message> <message> - <location filename="../programs/mythfrontend/main.cpp" line="1462"/> @@ -10072,7 +10132,7 @@ <source>MythImage Media Handler 2/2</source> <translation>MythImage Media Handler 2/2</translation> </message> -@@ -11576,12 +11939,12 @@ +@@ -11576,12 +11961,12 @@ <message> <location filename="../programs/mythfrontend/mythcontrols.cpp" line="234"/> <source>Actions By Context</source> @@ -10087,7 +10147,7 @@ </message> <message> <location filename="../programs/mythfrontend/mythcontrols.cpp" line="236"/> -@@ -11642,57 +12005,57 @@ +@@ -11642,57 +12027,57 @@ <translation>Keys</translation> </message> <message> @@ -10095,7 +10155,7 @@ + <location filename="../programs/mythwelcome/main.cpp" line="38"/> <source>Open an Xterm window</source> - <translation>Open an Xterm window</translation> -+ <translation>Open an Xterm Window</translation> ++ <translation>Open Xterm Window</translation> </message> <message> - <location filename="../programs/mythwelcome/main.cpp" line="39"/> @@ -10162,7 +10222,7 @@ <source>MythDVD DVD Media Handler</source> <translation>MythDVD DVD Media Handler</translation> </message> -@@ -11700,9 +12063,9 @@ +@@ -11700,9 +12085,9 @@ <context> <name>MythCoreContext</name> <message> @@ -10174,7 +10234,7 @@ </message> </context> <context> -@@ -11721,184 +12084,183 @@ +@@ -11721,184 +12106,183 @@ <context> <name>MythPlayer</name> <message> @@ -10209,14 +10269,14 @@ + <location filename="../libs/libmythtv/mythplayer.cpp" line="980"/> <source>Could not find an A/V decoder</source> - <translation>Could not find an A/V decoder</translation> -+ <translation>Could Not Find an A/V Decoder</translation> ++ <translation>Could Not Find a Decoder</translation> </message> <message> - <location filename="../libs/libmythtv/mythplayer.cpp" line="977"/> + <location filename="../libs/libmythtv/mythplayer.cpp" line="989"/> <source>Could not initialize A/V decoder</source> - <translation>Could not initialize A/V decoder</translation> -+ <translation>Could Not Initialize A/V Decoder</translation> ++ <translation>Could Not Initialize Decoder</translation> </message> <message> - <location filename="../libs/libmythtv/mythplayer.cpp" line="1002"/> @@ -10417,7 +10477,7 @@ <source>%n second(s)</source> <translation> <numerusform>%n second</numerusform> -@@ -11906,42 +12268,42 @@ +@@ -11906,42 +12290,42 @@ </translation> </message> <message> @@ -10470,7 +10530,7 @@ <source>Disabled Night Mode</source> <translation>Disabled Night Mode</translation> </message> -@@ -11964,7 +12326,7 @@ +@@ -11964,7 +12348,7 @@ <message> <location filename="../libs/libmythtv/AirPlay/mythraopconnection.cpp" line="1500"/> <source>Failed to read key from: %1</source> @@ -10479,7 +10539,7 @@ </message> <message> <location filename="../libs/libmythtv/AirPlay/mythraopconnection.cpp" line="1517"/> -@@ -12019,7 +12381,7 @@ +@@ -12019,7 +12403,7 @@ <message> <location filename="../programs/mythwelcome/welcomesettings.cpp" line="136"/> <source>Wakeup time format</source> @@ -10488,7 +10548,7 @@ </message> <message> <location filename="../programs/mythwelcome/welcomesettings.cpp" line="139"/> -@@ -12039,7 +12401,7 @@ +@@ -12039,7 +12423,7 @@ <message> <location filename="../programs/mythwelcome/welcomesettings.cpp" line="163"/> <source>Command to reboot</source> @@ -10497,7 +10557,7 @@ </message> <message> <location filename="../programs/mythwelcome/welcomesettings.cpp" line="165"/> -@@ -12049,7 +12411,7 @@ +@@ -12049,7 +12433,7 @@ <message> <location filename="../programs/mythwelcome/welcomesettings.cpp" line="172"/> <source>Command to shutdown</source> @@ -10506,7 +10566,7 @@ </message> <message> <location filename="../programs/mythwelcome/welcomesettings.cpp" line="174"/> -@@ -12059,7 +12421,7 @@ +@@ -12059,7 +12443,7 @@ <message> <location filename="../programs/mythwelcome/welcomesettings.cpp" line="181"/> <source>Command to run to start the Frontend</source> @@ -10515,7 +10575,7 @@ </message> <message> <location filename="../programs/mythwelcome/welcomesettings.cpp" line="184"/> -@@ -12069,7 +12431,7 @@ +@@ -12069,7 +12453,7 @@ <message> <location filename="../programs/mythwelcome/welcomesettings.cpp" line="191"/> <source>Command to run Xterm</source> @@ -10524,7 +10584,7 @@ </message> <message> <location filename="../programs/mythwelcome/welcomesettings.cpp" line="193"/> -@@ -12085,212 +12447,217 @@ +@@ -12085,212 +12469,217 @@ <context> <name>MythSystemEventEditor</name> <message> @@ -10539,14 +10599,14 @@ <source>Recording pending</source> - <translation>Recording pending</translation> + <translation>Recording Pending</translation> - </message> - <message> -- <location filename="../libs/libmythtv/mythsystemevent.cpp" line="385"/> ++ </message> ++ <message> + <location filename="../libs/libmythtv/mythsystemevent.cpp" line="388"/> + <source>Recording about to fail</source> + <translation>Recording About to Fail</translation> -+ </message> -+ <message> + </message> + <message> +- <location filename="../libs/libmythtv/mythsystemevent.cpp" line="385"/> + <location filename="../libs/libmythtv/mythsystemevent.cpp" line="390"/> <source>Recording failing</source> - <translation>Recording failing</translation> @@ -10823,7 +10883,7 @@ </message> </context> <context> -@@ -12303,12 +12670,12 @@ +@@ -12303,12 +12692,12 @@ <message> <location filename="../libs/libmythui/myththemedmenu.cpp" line="322"/> <source>Enter standby mode</source> @@ -10838,7 +10898,7 @@ </message> <message> <location filename="../libs/libmythui/myththemedmenu.cpp" line="333"/> -@@ -12339,12 +12706,12 @@ +@@ -12339,12 +12728,12 @@ <message> <location filename="../libs/libmythui/myththemedmenu.cpp" line="377"/> <source>Ok</source> @@ -10853,7 +10913,7 @@ </message> <message> <location filename="../libs/libmythui/myththemedmenu.cpp" line="626"/> -@@ -12390,8 +12757,8 @@ +@@ -12390,8 +12779,8 @@ <context> <name>MythUISearchDialog</name> <message numerus="yes"> @@ -10864,7 +10924,7 @@ <source>%n match(es)</source> <translation> <numerusform>%n match</numerusform> -@@ -12402,76 +12769,76 @@ +@@ -12402,76 +12791,76 @@ <context> <name>MythUIWebBrowser</name> <message> @@ -10965,7 +11025,7 @@ <source>Cancel</source> <translation>Cancel</translation> </message> -@@ -12482,7 +12849,7 @@ +@@ -12482,7 +12871,7 @@ <location filename="../programs/mythwelcome/welcomesettings.cpp" line="14"/> <location filename="../programs/mythwelcome/welcomesettings.cpp" line="34"/> <source>Period %1 start time</source> @@ -10974,7 +11034,7 @@ </message> <message> <location filename="../programs/mythwelcome/welcomesettings.cpp" line="15"/> -@@ -12494,7 +12861,7 @@ +@@ -12494,7 +12883,7 @@ <location filename="../programs/mythwelcome/welcomesettings.cpp" line="24"/> <location filename="../programs/mythwelcome/welcomesettings.cpp" line="44"/> <source>Period %1 end time</source> @@ -10983,7 +11043,7 @@ </message> <message> <location filename="../programs/mythwelcome/welcomesettings.cpp" line="25"/> -@@ -12541,7 +12908,7 @@ +@@ -12541,7 +12930,7 @@ <location filename="../programs/mythwelcome/welcomesettings.cpp" line="96"/> <location filename="../programs/mythwelcome/welcomesettings.cpp" line="101"/> <source>Daily Wakeup/ShutDown Period %1</source> @@ -10992,7 +11052,7 @@ </message> </context> <context> -@@ -12570,7 +12937,7 @@ +@@ -12570,7 +12959,7 @@ <context> <name>NetworkControl</name> <message> @@ -11001,7 +11061,7 @@ <source>Network Control</source> <translation>Network Control</translation> </message> -@@ -12578,87 +12945,87 @@ +@@ -12578,87 +12967,87 @@ <context> <name>OSDSettings</name> <message> @@ -11114,7 +11174,7 @@ <source>On-screen Display</source> <translation>On-screen Display</translation> </message> -@@ -12719,7 +13086,7 @@ +@@ -12719,7 +13108,7 @@ <context> <name>PaneATSC</name> <message> @@ -11123,7 +11183,7 @@ <source>Scanning Range</source> <translation>Scanning Range</translation> </message> -@@ -12727,12 +13094,12 @@ +@@ -12727,12 +13116,12 @@ <context> <name>PaneDVBUtilsImport</name> <message> @@ -11139,20 +11199,18 @@ <source>Location of the channels.conf file.</source> <translation>Location of the channels.conf file.</translation> </message> -@@ -12802,67 +13169,80 @@ +@@ -12802,67 +13191,78 @@ </message> </context> <context> + <name>PlayBackScaling</name> + <message> -+ <location filename="../programs/mythfrontend/globalsettings.cpp" line="3874"/> + <source>Scaling</source> -+ <translation>Scaling</translation> ++ <translation type="vanished">Scaling</translation> + </message> + <message> -+ <location filename="../programs/mythfrontend/globalsettings.cpp" line="3897"/> + <source>No scaling</source> -+ <translation>No Scaling</translation> ++ <translation type="vanished">No Scaling</translation> + </message> +</context> +<context> @@ -11240,7 +11298,7 @@ <source>%1 Group</source> <comment>Play Group</comment> <extracomment>%1 is the name of the playgroup</extracomment> -@@ -12872,410 +13252,417 @@ +@@ -12872,631 +13272,651 @@ <context> <name>PlayGroupEditor</name> <message> @@ -11553,7 +11611,7 @@ + <location filename="../programs/mythfrontend/playbackbox.cpp" line="2375"/> <source>This recording is already being deleted</source> - <translation>This recording is already being deleted</translation> -+ <translation>This Recording Is Already Being Deleted</translation> ++ <translation>This Recording is Already Being Deleted</translation> </message> <message> - <location filename="../programs/mythfrontend/playbackbox.cpp" line="2450"/> @@ -11570,7 +11628,7 @@ + <location filename="../programs/mythfrontend/playbackbox.cpp" line="2735"/> <source>This recording is currently Available</source> - <translation>This recording is currently Available</translation> -+ <translation>This Recording Is Currently Available</translation> ++ <translation>This Recording is Currently Available</translation> </message> <message> - <location filename="../programs/mythfrontend/playbackbox.cpp" line="2709"/> @@ -11593,14 +11651,14 @@ + <location filename="../programs/mythfrontend/playbackbox.cpp" line="2742"/> <source>This recording is currently being deleted and is unavailable</source> - <translation>This recording is currently being deleted and is unavailable</translation> -+ <translation>This Recording Is Currently Being Deleted and Is Unavailable</translation> ++ <translation>This Recording is Currently Being Deleted and is Unavailable</translation> </message> <message> - <location filename="../programs/mythfrontend/playbackbox.cpp" line="2717"/> + <location filename="../programs/mythfrontend/playbackbox.cpp" line="2748"/> <source>This recording has been deleted and is unavailable</source> - <translation>This recording has been deleted and is unavailable</translation> -+ <translation>This Recording Has Been Deleted and Is Unavailable</translation> ++ <translation>This Recording Has Been Deleted and is Unavailable</translation> </message> <message> - <location filename="../programs/mythfrontend/playbackbox.cpp" line="2723"/> @@ -11614,14 +11672,14 @@ + <location filename="../programs/mythfrontend/playbackbox.cpp" line="2760"/> <source>The file for this recording is empty.</source> - <translation>The file for this recording is empty.</translation> -+ <translation>The File for This Recording Is Empty</translation> ++ <translation>The File for This Recording is Empty</translation> </message> <message> - <location filename="../programs/mythfrontend/playbackbox.cpp" line="2735"/> + <location filename="../programs/mythfrontend/playbackbox.cpp" line="2766"/> <source>This recording is not yet available.</source> - <translation>This recording is not yet available.</translation> -+ <translation>This Recording Is Not Yet Available</translation> ++ <translation>This Recording is Not Yet Available</translation> </message> <message> - <location filename="../programs/mythfrontend/playbackbox.cpp" line="2747"/> @@ -11802,8 +11860,10 @@ + <location filename="../programs/mythfrontend/playbackbox.cpp" line="2824"/> <source>There is %n item(s) in the playlist. Actions affect all items in the playlist</source> <translation> - <numerusform>There is %n item in the playlist. Actions affect all items in the playlist</numerusform> -@@ -13283,220 +13670,233 @@ +- <numerusform>There is %n item in the playlist. Actions affect all items in the playlist</numerusform> +- <numerusform>There are %n items in the playlist. Actions affect all items in the playlist</numerusform> ++ <numerusform>There is %n item in the playlist. Actions affect all items in the playlist.</numerusform> ++ <numerusform>There are %n items in the playlist. Actions affect all items in the playlist.</numerusform> </translation> </message> <message> @@ -11846,14 +11906,14 @@ + <numerusform>There is %n recording in this display group, which consumes %1 GiB.</numerusform> + <numerusform>There are %n recordings in this display group, which consume %1 GiB.</numerusform> + </translation> - </message> - <message> -- <location filename="../programs/mythfrontend/playbackbox.cpp" line="2996"/> ++ </message> ++ <message> + <location filename="../programs/mythfrontend/playbackbox.cpp" line="744"/> + <source>There is no recording in this display group.</source> + <translation>There Are No Recordings in This Display Group</translation> -+ </message> -+ <message> + </message> + <message> +- <location filename="../programs/mythfrontend/playbackbox.cpp" line="2996"/> + <location filename="../programs/mythfrontend/playbackbox.cpp" line="3027"/> <source>Do not preserve this episode</source> - <translation>Do not preserve this episode</translation> @@ -12108,7 +12168,7 @@ <source>%1 [%n item(s)]</source> <translation> <numerusform>%1 [%n item]</numerusform> -@@ -13504,32 +13904,32 @@ +@@ -13504,32 +13924,32 @@ </translation> </message> <message> @@ -12147,7 +12207,7 @@ <source>New Recording Group</source> <translation>New Recording Group</translation> </message> -@@ -13537,18 +13937,22 @@ +@@ -13537,18 +13957,22 @@ <context> <name>PlaybackProfileConfig</name> <message> @@ -12174,7 +12234,7 @@ <source>Add New Entry</source> <translation>Add New Entry</translation> </message> -@@ -13556,662 +13960,798 @@ +@@ -13556,662 +13980,808 @@ <context> <name>PlaybackProfileConfigs</name> <message> @@ -12387,14 +12447,14 @@ <source>When unchecked the deblocking loopfilter will be disabled </source> - <translation>When unchecked the deblocking loopfilter will be disabled </translation> + <translation>When unchecked the deblocking loopfilter will be disabled.</translation> -+ </message> -+ <message> -+ <location filename="../programs/mythfrontend/globalsettings.cpp" line="881"/> -+ <source>Invalid frame rate specification(%1), discarded</source> -+ <translation>Invalid Frame Rate Specification(%1), Discarded</translation> </message> <message> - <location filename="../programs/mythfrontend/globalsettings.cpp" line="920"/> ++ <location filename="../programs/mythfrontend/globalsettings.cpp" line="881"/> ++ <source>Invalid frame rate specification(%1), discarded</source> ++ <translation>Invalid Frame Rate Specification(%1), Discarded</translation> ++ </message> ++ <message> + <location filename="../programs/mythfrontend/globalsettings.cpp" line="953"/> <source>Main deinterlacing method. %1</source> - <translation>Main deinterlacing method. %1</translation> @@ -13066,6 +13126,16 @@ <message> - <location filename="../programs/mythfrontend/globalsettings.cpp" line="3909"/> - <location filename="../programs/mythfrontend/globalsettings.cpp" line="3941"/> ++ <location filename="../programs/mythfrontend/globalsettings.cpp" line="3874"/> ++ <source>Scaling</source> ++ <translation>Scaling</translation> ++ </message> ++ <message> ++ <location filename="../programs/mythfrontend/globalsettings.cpp" line="3897"/> ++ <source>No scaling</source> ++ <translation>No Scaling</translation> ++ </message> ++ <message> + <location filename="../programs/mythfrontend/globalsettings.cpp" line="4001"/> + <source>Playback settings</source> + <translation>Playback Settings</translation> @@ -13179,7 +13249,7 @@ </message> </context> <context> -@@ -14224,12 +14764,12 @@ +@@ -14224,12 +14794,12 @@ <message> <location filename="../programs/mythfrontend/videoplayersettings.cpp" line="92"/> <source>This can be any command to launch a DVD player. Internal is the default. For other players, %d will be substituted for the DVD device (e.g. /dev/dvd).</source> @@ -13194,7 +13264,7 @@ </message> <message> <location filename="../programs/mythfrontend/videoplayersettings.cpp" line="101"/> -@@ -14249,12 +14789,12 @@ +@@ -14249,12 +14819,12 @@ <message> <location filename="../programs/mythfrontend/videoplayersettings.cpp" line="112"/> <source>Exit without saving settings</source> @@ -13209,7 +13279,7 @@ </message> <message> <location filename="../programs/mythfrontend/videoplayersettings.cpp" line="170"/> -@@ -14308,12 +14848,21 @@ +@@ -14308,12 +14878,21 @@ <context> <name>ProfileGroup</name> <message> @@ -13222,19 +13292,19 @@ + <location filename="../libs/libmythtv/profilegroup.cpp" line="47"/> + <source>Profile Group</source> + <translation>Profile Group</translation> - </message> - <message> -- <location filename="../libs/libmythtv/profilegroup.cpp" line="168"/> ++ </message> ++ <message> + <location filename="../libs/libmythtv/profilegroup.cpp" line="171"/> + <source>Profiles</source> + <translation>Profiles</translation> -+ </message> -+ <message> + </message> + <message> +- <location filename="../libs/libmythtv/profilegroup.cpp" line="168"/> + <location filename="../libs/libmythtv/profilegroup.cpp" line="180"/> <source>Transcoders</source> <translation>Transcoders</translation> </message> -@@ -14321,52 +14870,52 @@ +@@ -14321,52 +14900,52 @@ <context> <name>ProfileGroupEditor</name> <message> @@ -13262,14 +13332,15 @@ <source>Yes, delete group</source> - <translation>Yes, delete group</translation> + <translation type="vanished">Yes, Delete Group</translation> ++ </message> ++ <message> ++ <source>No, Don't delete group</source> ++ <translation type="vanished">No, Keep Group</translation> </message> <message> - <location filename="../libs/libmythtv/profilegroup.cpp" line="361"/> - <source>No, Don't delete group</source> +- <source>No, Don't delete group</source> - <translation>No, Don't delete group</translation> -+ <translation type="vanished">No, Keep Group</translation> -+ </message> -+ <message> + <location filename="../libs/libmythtv/profilegroup.h" line="126"/> + <source>Profile Group</source> + <translation>Profile Group</translation> @@ -13301,7 +13372,7 @@ <source>%n star(s)</source> <translation> <numerusform>%n star</numerusform> -@@ -14374,199 +14923,208 @@ +@@ -14374,199 +14953,204 @@ </translation> </message> <message> @@ -13372,10 +13443,6 @@ </message> <message> - <location filename="../programs/mythfrontend/progdetails.cpp" line="328"/> -+ <source>Damaged</source> -+ <translation type="vanished">Damaged</translation> -+ </message> -+ <message> + <location filename="../programs/mythfrontend/progdetails.cpp" line="291"/> <source>CC</source> <comment>Closed Captioned</comment> @@ -13549,7 +13616,7 @@ <source>%n hour(s)</source> <translation> <numerusform>%n hour</numerusform> -@@ -14574,133 +15132,126 @@ +@@ -14574,133 +15158,126 @@ </translation> </message> <message> @@ -13709,7 +13776,7 @@ </message> </context> <context> -@@ -14794,7 +15345,7 @@ +@@ -14794,7 +15371,7 @@ <message> <location filename="../programs/mythfrontend/progfind.cpp" line="371"/> <source>Select a letter...</source> @@ -13718,7 +13785,7 @@ </message> <message> <location filename="../programs/mythfrontend/progfind.cpp" line="373"/> -@@ -14804,7 +15355,7 @@ +@@ -14804,7 +15381,7 @@ <message> <location filename="../programs/mythfrontend/progfind.cpp" line="382"/> <source>Select a program...</source> @@ -13727,7 +13794,7 @@ </message> <message> <location filename="../programs/mythfrontend/progfind.cpp" line="384"/> -@@ -14951,7 +15502,7 @@ +@@ -14951,7 +15528,7 @@ <message> <location filename="../programs/mythfrontend/proglist.cpp" line="519"/> <source>Start search from date and time</source> @@ -13736,7 +13803,7 @@ </message> <message> <location filename="../programs/mythfrontend/proglist.cpp" line="766"/> -@@ -14971,12 +15522,12 @@ +@@ -14971,12 +15548,12 @@ <message> <location filename="../programs/mythfrontend/proglist.cpp" line="326"/> <source>Sort By Title</source> @@ -13751,7 +13818,7 @@ </message> <message> <location filename="../programs/mythfrontend/proglist.cpp" line="489"/> -@@ -15001,7 +15552,7 @@ +@@ -15001,7 +15578,7 @@ <message> <location filename="../programs/mythfrontend/proglist.cpp" line="494"/> <source>Select a search stored from</source> @@ -13760,7 +13827,7 @@ </message> <message> <location filename="../programs/mythfrontend/proglist.cpp" line="495"/> -@@ -15027,14 +15578,14 @@ +@@ -15027,14 +15604,14 @@ </translation> </message> <message> @@ -13778,7 +13845,7 @@ <source>%1 of %2</source> <comment>Current position in list where %1 is the position, %2 is the total count</comment> <translation>%1 of %2</translation> -@@ -15062,22 +15613,22 @@ +@@ -15062,22 +15639,22 @@ <message> <location filename="../programs/mythfrontend/proglist.cpp" line="761"/> <source>Allow this episode to re-record</source> @@ -13805,7 +13872,7 @@ </message> <message> <location filename="../programs/mythfrontend/proglist.cpp" line="940"/> -@@ -15211,43 +15762,43 @@ +@@ -15211,43 +15788,43 @@ <location filename="../programs/mythfrontend/programrecpriority.cpp" line="663"/> <location filename="../programs/mythfrontend/programrecpriority.cpp" line="743"/> <source>Sort By Title</source> @@ -13856,7 +13923,7 @@ </message> <message> <location filename="../programs/mythfrontend/programrecpriority.cpp" line="728"/> -@@ -15284,13 +15835,13 @@ +@@ -15284,13 +15861,13 @@ <context> <name>QObject</name> <message> @@ -13868,35 +13935,35 @@ <message numerus="yes"> - <location filename="../libs/libmyth/programinfo.cpp" line="1697"/> - <location filename="../libs/libmyth/programinfo.cpp" line="1702"/> -+ <location filename="../libs/libmyth/programinfo.cpp" line="1720"/> -+ <location filename="../libs/libmyth/programinfo.cpp" line="1725"/> ++ <location filename="../libs/libmyth/programinfo.cpp" line="1711"/> ++ <location filename="../libs/libmyth/programinfo.cpp" line="1716"/> <source>%n hour(s)</source> <translation> <numerusform>%n hour</numerusform> -@@ -15298,8 +15849,8 @@ +@@ -15298,8 +15875,8 @@ </translation> </message> <message numerus="yes"> - <location filename="../libs/libmyth/programinfo.cpp" line="1686"/> - <location filename="../libs/libmyth/programinfo.cpp" line="1695"/> ++ <location filename="../libs/libmyth/programinfo.cpp" line="1700"/> + <location filename="../libs/libmyth/programinfo.cpp" line="1709"/> -+ <location filename="../libs/libmyth/programinfo.cpp" line="1718"/> <source>%n minute(s)</source> <translation> <numerusform>%n minute</numerusform> -@@ -15307,24 +15858,24 @@ +@@ -15307,24 +15884,24 @@ </translation> </message> <message> - <location filename="../libs/libmyth/programinfo.cpp" line="1035"/> -+ <location filename="../libs/libmyth/programinfo.cpp" line="1036"/> ++ <location filename="../libs/libmyth/programinfo.cpp" line="1027"/> + <location filename="../libs/libmythmetadata/metadatacommon.h" line="255"/> <source>Manual Record</source> <translation>Manual Record</translation> </message> <message> - <location filename="../libs/libmyth/programinfo.cpp" line="1725"/> -+ <location filename="../libs/libmyth/programinfo.cpp" line="1748"/> ++ <location filename="../libs/libmyth/programinfo.cpp" line="1739"/> <source>Re-Record</source> - <translation>Re-Record</translation> + <translation>Re-record</translation> @@ -13905,18 +13972,18 @@ - <location filename="../libs/libmyth/programinfo.cpp" line="1767"/> - <location filename="../libs/libmyth/programinfo.cpp" line="1772"/> - <location filename="../libs/libmyth/programtypes.cpp" line="212"/> -+ <location filename="../libs/libmyth/programinfo.cpp" line="1790"/> -+ <location filename="../libs/libmyth/programinfo.cpp" line="1795"/> ++ <location filename="../libs/libmyth/programinfo.cpp" line="1781"/> ++ <location filename="../libs/libmyth/programinfo.cpp" line="1786"/> <source>Repeat</source> <translation>Repeat</translation> </message> <message numerus="yes"> - <location filename="../libs/libmyth/programinfo.cpp" line="1795"/> -+ <location filename="../libs/libmyth/programinfo.cpp" line="1818"/> ++ <location filename="../libs/libmyth/programinfo.cpp" line="1809"/> <source>%n star(s)</source> <translation> <numerusform>%n star</numerusform> -@@ -15333,60 +15884,57 @@ +@@ -15333,60 +15910,57 @@ </message> <message> <location filename="../libs/libmythtv/channelinfo.cpp" line="280"/> @@ -13937,8 +14004,8 @@ - <location filename="../libs/libmyth/programinfo.cpp" line="4980"/> - <location filename="../libs/libmyth/programtypes.cpp" line="228"/> - <location filename="../libs/libmyth/programtypes.cpp" line="231"/> -+ <location filename="../libs/libmyth/programinfo.cpp" line="3134"/> -+ <location filename="../libs/libmyth/programinfo.cpp" line="5003"/> ++ <location filename="../libs/libmyth/programinfo.cpp" line="3125"/> ++ <location filename="../libs/libmyth/programinfo.cpp" line="4994"/> <location filename="../libs/libmythtv/videoouttypes.h" line="137"/> <location filename="../libs/libmythtv/videoouttypes.h" line="160"/> - <location filename="../programs/mythfrontend/statusbox.cpp" line="1053"/> @@ -13948,48 +14015,48 @@ </message> <message> - <location filename="../libs/libmyth/programinfo.cpp" line="3115"/> -+ <location filename="../libs/libmyth/programinfo.cpp" line="3138"/> ++ <location filename="../libs/libmyth/programinfo.cpp" line="3129"/> <source>Playing</source> <translation>Playing</translation> </message> <message> - <location filename="../libs/libmyth/programinfo.cpp" line="3122"/> - <location filename="../libs/libmyth/programtypes.cpp" line="185"/> -+ <location filename="../libs/libmyth/programinfo.cpp" line="3145"/> ++ <location filename="../libs/libmyth/programinfo.cpp" line="3136"/> <source>Recording</source> <translation>Recording</translation> </message> <message> - <location filename="../libs/libmyth/programinfo.cpp" line="3130"/> -+ <location filename="../libs/libmyth/programinfo.cpp" line="3153"/> ++ <location filename="../libs/libmyth/programinfo.cpp" line="3144"/> <source>Transcoding</source> <translation>Transcoding</translation> </message> <message> - <location filename="../libs/libmyth/programinfo.cpp" line="3117"/> -+ <location filename="../libs/libmyth/programinfo.cpp" line="3140"/> ++ <location filename="../libs/libmyth/programinfo.cpp" line="3131"/> <source>PIP</source> <translation>PIP</translation> </message> <message> - <location filename="../libs/libmyth/programinfo.cpp" line="1847"/> -+ <location filename="../libs/libmyth/programinfo.cpp" line="1870"/> ++ <location filename="../libs/libmyth/programinfo.cpp" line="1861"/> <source>Blu-ray Disc</source> <translation>Blu-ray Disc</translation> </message> <message> - <location filename="../libs/libmyth/programinfo.cpp" line="3119"/> -+ <location filename="../libs/libmyth/programinfo.cpp" line="3142"/> ++ <location filename="../libs/libmyth/programinfo.cpp" line="3133"/> <source>PBP</source> <translation>PBP</translation> </message> <message> - <location filename="../libs/libmyth/programinfo.cpp" line="3124"/> -+ <location filename="../libs/libmyth/programinfo.cpp" line="3147"/> ++ <location filename="../libs/libmyth/programinfo.cpp" line="3138"/> <source>File transfer</source> <translation>File transfer</translation> </message> -@@ -15436,47 +15984,47 @@ +@@ -15436,47 +16010,47 @@ <message> <location filename="../libs/libmyth/recordingtypes.cpp" line="55"/> <source>Record only this showing</source> @@ -14046,7 +14113,7 @@ </message> <message> <location filename="../libs/libmyth/recordingtypes.cpp" line="137"/> -@@ -15513,655 +16061,585 @@ +@@ -15513,655 +16087,585 @@ <translation>Override Recording</translation> </message> <message> @@ -14490,267 +14557,267 @@ </message> <message> - <location filename="../libs/libmyth/programinfo.cpp" line="5223"/> -+ <location filename="../libs/libmyth/programinfo.cpp" line="5246"/> ++ <location filename="../libs/libmyth/programinfo.cpp" line="5190"/> <source>Default</source> <comment>Recording Profile Default</comment> <translation>Default</translation> </message> <message> - <location filename="../libs/libmyth/programinfo.cpp" line="5224"/> -+ <location filename="../libs/libmyth/programinfo.cpp" line="5247"/> ++ <location filename="../libs/libmyth/programinfo.cpp" line="5191"/> <source>High Quality</source> <comment>Recording Profile High Quality</comment> <translation>High Quality</translation> </message> <message> - <location filename="../libs/libmyth/programinfo.cpp" line="5225"/> -+ <location filename="../libs/libmyth/programinfo.cpp" line="5248"/> ++ <location filename="../libs/libmyth/programinfo.cpp" line="5192"/> <source>Live TV</source> <comment>Recording Profile Live TV</comment> <translation>Live TV</translation> </message> <message> - <location filename="../libs/libmyth/programinfo.cpp" line="5226"/> -+ <location filename="../libs/libmyth/programinfo.cpp" line="5249"/> ++ <location filename="../libs/libmyth/programinfo.cpp" line="5193"/> <source>Low Quality</source> <comment>Recording Profile Low Quality</comment> <translation>Low Quality</translation> </message> <message> - <location filename="../libs/libmyth/programinfo.cpp" line="5227"/> -+ <location filename="../libs/libmyth/programinfo.cpp" line="5250"/> ++ <location filename="../libs/libmyth/programinfo.cpp" line="5194"/> <source>Medium Quality</source> <comment>Recording Profile Medium Quality</comment> <translation>Medium Quality</translation> </message> <message> - <location filename="../libs/libmyth/programinfo.cpp" line="5233"/> -+ <location filename="../libs/libmyth/programinfo.cpp" line="5256"/> ++ <location filename="../libs/libmyth/programinfo.cpp" line="5200"/> <source>CRC IP Recorders</source> <comment>Recording Profile Group Name</comment> <translation>CRC IP Recorders</translation> </message> <message> - <location filename="../libs/libmyth/programinfo.cpp" line="5235"/> -+ <location filename="../libs/libmyth/programinfo.cpp" line="5258"/> ++ <location filename="../libs/libmyth/programinfo.cpp" line="5202"/> <source>FireWire Input</source> <comment>Recording Profile Group Name</comment> <translation>FireWire Input</translation> </message> <message> - <location filename="../libs/libmyth/programinfo.cpp" line="5237"/> -+ <location filename="../libs/libmyth/programinfo.cpp" line="5260"/> ++ <location filename="../libs/libmyth/programinfo.cpp" line="5204"/> <source>Freebox Input</source> <comment>Recording Profile Group Name</comment> <translation>Freebox Input</translation> </message> <message> - <location filename="../libs/libmyth/programinfo.cpp" line="5239"/> -+ <location filename="../libs/libmyth/programinfo.cpp" line="5262"/> ++ <location filename="../libs/libmyth/programinfo.cpp" line="5206"/> <source>Hardware DVB Encoders</source> <comment>Recording Profile Group Name</comment> <translation>Hardware DVB Encoders</translation> </message> <message> - <location filename="../libs/libmyth/programinfo.cpp" line="5241"/> -+ <location filename="../libs/libmyth/programinfo.cpp" line="5264"/> ++ <location filename="../libs/libmyth/programinfo.cpp" line="5208"/> <source>Hardware HDTV</source> <comment>Recording Profile Group Name</comment> <translation>Hardware HDTV</translation> </message> <message> - <location filename="../libs/libmyth/programinfo.cpp" line="5243"/> -+ <location filename="../libs/libmyth/programinfo.cpp" line="5266"/> ++ <location filename="../libs/libmyth/programinfo.cpp" line="5210"/> <source>Hardware MJPEG Encoders (Matrox G200-TV, Miro DC10, etc)</source> <comment>Recording Profile Group Name</comment> <translation>Hardware MJPEG Encoders (Matrox G200-TV, Miro DC10, etc)</translation> </message> <message> - <location filename="../libs/libmyth/programinfo.cpp" line="5245"/> -+ <location filename="../libs/libmyth/programinfo.cpp" line="5268"/> ++ <location filename="../libs/libmyth/programinfo.cpp" line="5212"/> <source>HD-PVR Recorders</source> <comment>Recording Profile Group Name</comment> <translation>HD-PVR Recorders</translation> </message> <message> - <location filename="../libs/libmyth/programinfo.cpp" line="5247"/> -+ <location filename="../libs/libmyth/programinfo.cpp" line="5270"/> ++ <location filename="../libs/libmyth/programinfo.cpp" line="5214"/> <source>HDHomeRun Recorders</source> <comment>Recording Profile Group Name</comment> <translation>HDHomeRun Recorders</translation> </message> <message> - <location filename="../libs/libmyth/programinfo.cpp" line="5249"/> -+ <location filename="../libs/libmyth/programinfo.cpp" line="5272"/> ++ <location filename="../libs/libmyth/programinfo.cpp" line="5216"/> <source>MPEG-2 Encoders (PVR-x50, PVR-500)</source> <comment>Recording Profile Group Name</comment> <translation>MPEG-2 Encoders (PVR-x50, PVR-500)</translation> </message> <message> - <location filename="../libs/libmyth/programinfo.cpp" line="5253"/> -+ <location filename="../libs/libmyth/programinfo.cpp" line="5276"/> ++ <location filename="../libs/libmyth/programinfo.cpp" line="5220"/> <source>Transcoders</source> <comment>Recording Profile Group Name</comment> <translation>Transcoders</translation> </message> <message> - <location filename="../libs/libmyth/programinfo.cpp" line="5257"/> -+ <location filename="../libs/libmyth/programinfo.cpp" line="5280"/> ++ <location filename="../libs/libmyth/programinfo.cpp" line="5224"/> <source>V4L2 Encoders</source> <comment>Recording Profile Group Name</comment> <translation>V4L2 Encoders</translation> </message> <message> - <location filename="../libs/libmyth/programinfo.cpp" line="5261"/> -+ <location filename="../libs/libmyth/programinfo.cpp" line="5284"/> ++ <location filename="../libs/libmyth/programinfo.cpp" line="5228"/> <source>All Programs</source> <comment>Recording Group All Programs</comment> <translation>All Programs</translation> </message> <message> - <location filename="../libs/libmyth/programinfo.cpp" line="5262"/> -+ <location filename="../libs/libmyth/programinfo.cpp" line="5285"/> ++ <location filename="../libs/libmyth/programinfo.cpp" line="5229"/> <source>All</source> <comment>Recording Group All Programs -- short form</comment> <translation>All</translation> </message> <message> - <location filename="../libs/libmyth/programinfo.cpp" line="5264"/> -+ <location filename="../libs/libmyth/programinfo.cpp" line="5287"/> ++ <location filename="../libs/libmyth/programinfo.cpp" line="5231"/> <source>Default</source> <comment>Recording Group Default</comment> <translation>Default</translation> </message> <message> - <location filename="../libs/libmyth/programinfo.cpp" line="5265"/> -+ <location filename="../libs/libmyth/programinfo.cpp" line="5288"/> ++ <location filename="../libs/libmyth/programinfo.cpp" line="5232"/> <source>Deleted</source> <comment>Recording Group Deleted</comment> <translation>Deleted</translation> </message> <message> - <location filename="../libs/libmyth/programinfo.cpp" line="5272"/> -+ <location filename="../libs/libmyth/programinfo.cpp" line="5295"/> ++ <location filename="../libs/libmyth/programinfo.cpp" line="5239"/> <source>Default</source> <comment>Storage Group Name</comment> <translation>Default</translation> </message> <message> - <location filename="../libs/libmyth/programinfo.cpp" line="3128"/> -+ <location filename="../libs/libmyth/programinfo.cpp" line="3151"/> ++ <location filename="../libs/libmyth/programinfo.cpp" line="3142"/> <source>Commercial Detection</source> <translation>Commercial Detection</translation> </message> <message> - <location filename="../libs/libmyth/programinfo.cpp" line="1679"/> -+ <location filename="../libs/libmyth/programinfo.cpp" line="1702"/> ++ <location filename="../libs/libmyth/programinfo.cpp" line="1693"/> <source>%1 GB</source> <comment>GigaBytes</comment> <translation>%1 GB</translation> </message> <message> - <location filename="../libs/libmyth/programinfo.cpp" line="1835"/> -+ <location filename="../libs/libmyth/programinfo.cpp" line="1858"/> ++ <location filename="../libs/libmyth/programinfo.cpp" line="1849"/> <source>DVD</source> <translation>DVD</translation> </message> <message> - <location filename="../libs/libmyth/programinfo.cpp" line="1839"/> -+ <location filename="../libs/libmyth/programinfo.cpp" line="1862"/> ++ <location filename="../libs/libmyth/programinfo.cpp" line="1853"/> <source>HTTP Streaming</source> <translation>HTTP Streaming</translation> </message> <message> - <location filename="../libs/libmyth/programinfo.cpp" line="1843"/> -+ <location filename="../libs/libmyth/programinfo.cpp" line="1866"/> ++ <location filename="../libs/libmyth/programinfo.cpp" line="1857"/> <source>RTSP Streaming</source> <translation>RTSP Streaming</translation> </message> <message> - <location filename="../libs/libmyth/programinfo.cpp" line="1852"/> -+ <location filename="../libs/libmyth/programinfo.cpp" line="1875"/> ++ <location filename="../libs/libmyth/programinfo.cpp" line="1866"/> <source>Recording</source> <comment>Recorded file, object not action</comment> <translation>Recording</translation> </message> <message> - <location filename="../libs/libmyth/programinfo.cpp" line="3132"/> -+ <location filename="../libs/libmyth/programinfo.cpp" line="3155"/> ++ <location filename="../libs/libmyth/programinfo.cpp" line="3146"/> <source>Preview Generation</source> <translation>Preview Generation</translation> </message> <message> - <location filename="../libs/libmyth/programinfo.cpp" line="3134"/> -+ <location filename="../libs/libmyth/programinfo.cpp" line="3157"/> ++ <location filename="../libs/libmyth/programinfo.cpp" line="3148"/> <source>User Job</source> <translation>User Job</translation> </message> <message> - <location filename="../libs/libmyth/programinfo.cpp" line="5228"/> -+ <location filename="../libs/libmyth/programinfo.cpp" line="5251"/> ++ <location filename="../libs/libmyth/programinfo.cpp" line="5195"/> <source>MPEG-2</source> <comment>Recording Profile MPEG-2</comment> <translation>MPEG-2</translation> </message> <message> - <location filename="../libs/libmyth/programinfo.cpp" line="5229"/> -+ <location filename="../libs/libmyth/programinfo.cpp" line="5252"/> ++ <location filename="../libs/libmyth/programinfo.cpp" line="5196"/> <source>RTjpeg/MPEG-4</source> <comment>Recording Profile RTjpeg/MPEG-4</comment> <translation>RTjpeg/MPEG-4</translation> </message> <message> - <location filename="../libs/libmyth/programinfo.cpp" line="5251"/> -+ <location filename="../libs/libmyth/programinfo.cpp" line="5274"/> ++ <location filename="../libs/libmyth/programinfo.cpp" line="5218"/> <source>Software Encoders (V4L based)</source> <comment>Recording Profile Group Name</comment> <translation>Software Encoders (V4L based)</translation> </message> <message> - <location filename="../libs/libmyth/programinfo.cpp" line="5255"/> -+ <location filename="../libs/libmyth/programinfo.cpp" line="5278"/> ++ <location filename="../libs/libmyth/programinfo.cpp" line="5222"/> <source>USB MPEG-4 Encoder (Plextor ConvertX, etc)</source> <comment>Recording Profile Group Name</comment> <translation>USB MPEG-4 Encoder (Plextor ConvertX, etc)</translation> </message> <message> - <location filename="../libs/libmyth/programinfo.cpp" line="5263"/> -+ <location filename="../libs/libmyth/programinfo.cpp" line="5286"/> ++ <location filename="../libs/libmyth/programinfo.cpp" line="5230"/> <source>Live TV</source> <comment>Recording Group Live TV</comment> <translation>Live TV</translation> </message> <message> - <location filename="../libs/libmyth/programinfo.cpp" line="5268"/> -+ <location filename="../libs/libmyth/programinfo.cpp" line="5291"/> ++ <location filename="../libs/libmyth/programinfo.cpp" line="5235"/> <source>All Programs - %1</source> <comment>Show all programs from a specific recording group</comment> <translation>All Programs - %1</translation> </message> <message> - <location filename="../libs/libmyth/programinfo.cpp" line="5273"/> -+ <location filename="../libs/libmyth/programinfo.cpp" line="5296"/> ++ <location filename="../libs/libmyth/programinfo.cpp" line="5240"/> <source>Live TV</source> <comment>Storage Group Name</comment> <translation>Live TV</translation> </message> <message> - <location filename="../libs/libmyth/programinfo.cpp" line="5274"/> -+ <location filename="../libs/libmyth/programinfo.cpp" line="5297"/> ++ <location filename="../libs/libmyth/programinfo.cpp" line="5241"/> <source>Thumbnails</source> <comment>Storage Group Name</comment> <translation>Thumbnails</translation> </message> <message> - <location filename="../libs/libmyth/programinfo.cpp" line="5275"/> -+ <location filename="../libs/libmyth/programinfo.cpp" line="5298"/> ++ <location filename="../libs/libmyth/programinfo.cpp" line="5242"/> <source>DB Backups</source> <comment>Storage Group Name</comment> <translation>DB Backups</translation> </message> <message> - <location filename="../libs/libmyth/programinfo.cpp" line="5278"/> -+ <location filename="../libs/libmyth/programinfo.cpp" line="5301"/> ++ <location filename="../libs/libmyth/programinfo.cpp" line="5245"/> <source>Default</source> <comment>Playback Group Name</comment> <translation>Default</translation> @@ -14821,7 +14888,7 @@ <source>Pre & Post Roll</source> <translation>Pre & Post Roll</translation> </message> -@@ -16222,17 +16700,17 @@ +@@ -16222,17 +16726,17 @@ <message> <location filename="../libs/libmythtv/decoderbase.cpp" line="1130"/> <source>Audio track</source> @@ -14842,7 +14909,7 @@ </message> <message> <location filename="../libs/libmythtv/decoderbase.cpp" line="1136"/> -@@ -16307,208 +16785,212 @@ +@@ -16307,208 +16811,212 @@ <translation>Normal</translation> </message> <message> @@ -14872,8 +14939,8 @@ <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="88"/> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="122"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="149"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="196"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="150"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="197"/> <source>Port</source> <translation>Port</translation> </message> @@ -14886,8 +14953,8 @@ <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="346"/> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="367"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="418"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="439"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="419"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="440"/> <source>Wake command</source> - <translation>Wake command</translation> + <translation>Wake Command</translation> @@ -14970,7 +15037,7 @@ + <location filename="../libs/libmyth/mythcontext.cpp" line="1376"/> <source>Backend is online</source> - <translation>Backend is online</translation> -+ <translation>Backend Is Online</translation> ++ <translation>Backend is Online</translation> </message> <message> - <location filename="../libs/libmyth/mythcontext.cpp" line="1134"/> @@ -15014,8 +15081,8 @@ <message> - <location filename="../libs/libmyth/programinfo.cpp" line="1743"/> - <location filename="../libs/libmyth/programinfo.cpp" line="1747"/> -+ <location filename="../libs/libmyth/programinfo.cpp" line="1766"/> -+ <location filename="../libs/libmyth/programinfo.cpp" line="1770"/> ++ <location filename="../libs/libmyth/programinfo.cpp" line="1757"/> ++ <location filename="../libs/libmyth/programinfo.cpp" line="1761"/> <location filename="../programs/mythfrontend/programrecpriority.cpp" line="125"/> - <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2421"/> - <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2459"/> @@ -15115,12 +15182,12 @@ <source>, firmware: %2</source> <translation>, firmware: %2</translation> </message> -@@ -16518,13 +17000,13 @@ +@@ -16518,13 +17026,13 @@ <translation>Sports</translation> </message> <message> - <location filename="../libs/libmyth/programinfo.cpp" line="1831"/> -+ <location filename="../libs/libmyth/programinfo.cpp" line="1854"/> ++ <location filename="../libs/libmyth/programinfo.cpp" line="1845"/> <source>Video</source> <translation>Video</translation> </message> @@ -15132,7 +15199,7 @@ <source>All Channels</source> <translation>All Channels</translation> </message> -@@ -16541,12 +17023,12 @@ +@@ -16541,12 +17049,12 @@ <message> <location filename="../libs/libmythtv/channelscan/channelscan_sm.cpp" line="293"/> <source>Failed to add channel %1</source> @@ -15147,7 +15214,7 @@ </message> <message> <location filename="../libs/libmythtv/channelscan/channelscan_sm.cpp" line="895"/> -@@ -16556,7 +17038,7 @@ +@@ -16556,7 +17064,7 @@ <message> <location filename="../libs/libmythtv/channelscan/channelscan_sm.cpp" line="896"/> <source>Unknown decryption status</source> @@ -15156,7 +15223,7 @@ </message> <message> <location filename="../libs/libmythtv/channelscan/channelscan_sm.cpp" line="898"/> -@@ -16571,41 +17053,41 @@ +@@ -16571,41 +17079,41 @@ <message> <location filename="../libs/libmythtv/channelscan/channelscan_sm.cpp" line="935"/> <source>%1 -- Timed out</source> @@ -15206,7 +15273,7 @@ <source>: Found %n</source> <translation> <numerusform>: Found %n</numerusform> -@@ -16613,28 +17095,28 @@ +@@ -16613,28 +17121,28 @@ </translation> </message> <message> @@ -15237,20 +15304,20 @@ <message> <location filename="../libs/libmythtv/channelscan/frequencytablesetting.cpp" line="38"/> - <location filename="../libs/libmythtv/videosource.cpp" line="1276"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="1315"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="1318"/> <source>Broadcast</source> <translation>Broadcast</translation> </message> -@@ -16648,7 +17130,7 @@ +@@ -16648,7 +17156,7 @@ <location filename="../libs/libmythtv/channelscan/frequencytablesetting.cpp" line="40"/> <location filename="../libs/libmythtv/channelscan/frequencytablesetting.cpp" line="42"/> <location filename="../libs/libmythtv/channelscan/frequencytablesetting.cpp" line="44"/> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="522"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="594"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="595"/> <source>High</source> <translation>High</translation> </message> -@@ -16758,9 +17240,9 @@ +@@ -16758,9 +17266,9 @@ <translation>France</translation> </message> <message> @@ -15263,7 +15330,31 @@ <source>Frequency</source> <translation>Frequency</translation> </message> -@@ -16807,8 +17289,8 @@ +@@ -16785,30 +17293,30 @@ + <translation>Hue</translation> + </message> + <message> +- <location filename="../libs/libmythtv/recorders/dtvsignalmonitor.cpp" line="49"/> + <location filename="../libs/libmythtv/recorders/dtvsignalmonitor.cpp" line="50"/> + <location filename="../libs/libmythtv/recorders/dtvsignalmonitor.cpp" line="51"/> + <location filename="../libs/libmythtv/recorders/dtvsignalmonitor.cpp" line="52"/> + <location filename="../libs/libmythtv/recorders/dtvsignalmonitor.cpp" line="53"/> + <location filename="../libs/libmythtv/recorders/dtvsignalmonitor.cpp" line="54"/> + <location filename="../libs/libmythtv/recorders/dtvsignalmonitor.cpp" line="55"/> ++ <location filename="../libs/libmythtv/recorders/dtvsignalmonitor.cpp" line="56"/> + <source>Seen</source> + <translation>Seen</translation> + </message> + <message> +- <location filename="../libs/libmythtv/recorders/dtvsignalmonitor.cpp" line="56"/> + <location filename="../libs/libmythtv/recorders/dtvsignalmonitor.cpp" line="57"/> + <location filename="../libs/libmythtv/recorders/dtvsignalmonitor.cpp" line="58"/> + <location filename="../libs/libmythtv/recorders/dtvsignalmonitor.cpp" line="59"/> + <location filename="../libs/libmythtv/recorders/dtvsignalmonitor.cpp" line="60"/> + <location filename="../libs/libmythtv/recorders/dtvsignalmonitor.cpp" line="61"/> + <location filename="../libs/libmythtv/recorders/dtvsignalmonitor.cpp" line="62"/> ++ <location filename="../libs/libmythtv/recorders/dtvsignalmonitor.cpp" line="63"/> + <source>Matching</source> <translation>Matching</translation> </message> <message> @@ -15274,7 +15365,7 @@ <source>Analog</source> <translation>Analog</translation> </message> -@@ -16824,532 +17306,523 @@ +@@ -16824,532 +17332,523 @@ <translation>Play</translation> </message> <message> @@ -15962,7 +16053,7 @@ </message> <message> <location filename="../programs/mythfrontend/programrecpriority.cpp" line="123"/> -@@ -17357,410 +17830,418 @@ +@@ -17357,410 +17856,418 @@ <translation>Default (Template)</translation> </message> <message> @@ -16493,7 +16584,7 @@ </message> <message> <location filename="../libs/libmythtv/tv.cpp" line="55"/> -@@ -17786,448 +18267,464 @@ +@@ -17786,448 +18293,464 @@ <message> <location filename="../libs/libmythtv/tv.cpp" line="85"/> <source>Auto-Skip OFF</source> @@ -16514,14 +16605,14 @@ </message> <message> - <location filename="../libs/libmythtv/tv_rec.cpp" line="3731"/> -+ <location filename="../libs/libmythtv/tv_rec.cpp" line="3750"/> ++ <location filename="../libs/libmythtv/tv_rec.cpp" line="3703"/> <source>On known multiplex...</source> - <translation>On known multiplex...</translation> + <translation>On Known Multiplex...</translation> </message> <message> - <location filename="../libs/libmythtv/tvremoteutil.cpp" line="467"/> -+ <location filename="../libs/libmythtv/tvremoteutil.cpp" line="443"/> ++ <location filename="../libs/libmythtv/tvremoteutil.cpp" line="456"/> <source>Error querying recorder state</source> - <translation>Error querying recorder state</translation> + <translation>Error Querying Recorder State</translation> @@ -17063,7 +17154,7 @@ <source>Uses OpenMAX to alpha blend the OSD onto the video.</source> <translation>Uses OpenMAX to alpha blend the OSD onto the video.</translation> </message> -@@ -18388,217 +18885,230 @@ +@@ -18388,217 +18911,240 @@ <translation>Volume</translation> </message> <message> @@ -17092,7 +17183,7 @@ - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="170"/> + <location filename="../libs/libmythtv/videosource.cpp" line="382"/> + <location filename="../libs/libmythtv/videosource.cpp" line="397"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="242"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="243"/> <source>Channel frequency table</source> - <translation>Channel frequency table</translation> + <translation>Channel Frequency Table</translation> @@ -17168,6 +17259,11 @@ <source>No grabber</source> - <translation>No grabber</translation> + <translation>No Grabber</translation> ++ </message> ++ <message> ++ <location filename="../libs/libmythtv/videosource.cpp" line="663"/> ++ <source>This will usually only work with ATSC or DVB channels, and generally provides data only for the next few days.</source> ++ <translation>This will usually only work with ATSC or DVB channels, and generally provides data only for the next few days.</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="747"/> @@ -17185,7 +17281,12 @@ </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="948"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="990"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="969"/> ++ <source>Specify the command to run, with any needed arguments.</source> ++ <translation>Specify the command to run, with any needed arguments.</translation> ++ </message> ++ <message> ++ <location filename="../libs/libmythtv/videosource.cpp" line="993"/> <source>Audio device</source> - <translation>Audio device</translation> + <translation>Audio Device</translation> @@ -17196,30 +17297,30 @@ - <location filename="../libs/libmythtv/videosource.cpp" line="3073"/> - <location filename="../libs/libmythtv/videosource.cpp" line="3110"/> - <location filename="../libs/libmythtv/videosource.cpp" line="3121"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="1000"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="1048"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="2994"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="3039"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="3050"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="1003"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="1051"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="3004"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="3049"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="3060"/> <source>(None)</source> <translation>(None)</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="1022"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="1062"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="1065"/> <source>Do not adjust volume</source> - <translation>Do not adjust volume</translation> + <translation>Do Not Adjust Volume</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="1024"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="1064"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="1067"/> <source>Enable this option for budget BT878 based DVB-T cards such as the AverTV DVB-T which require the audio volume to be left alone.</source> <translation>Enable this option for budget BT878 based DVB-T cards such as the AverTV DVB-T which require the audio volume to be left alone.</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="1039"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="1078"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="1081"/> <source>When you change this setting, the text below should change to the name and type of your card. If the card cannot be opened, an error message will be displayed.</source> <translation>When you change this setting, the text below should change to the name and type of your card. If the card cannot be opened, an error message will be displayed.</translation> </message> @@ -17228,131 +17329,131 @@ - <location filename="../libs/libmythtv/videosource.cpp" line="1526"/> - <location filename="../libs/libmythtv/videosource.cpp" line="1744"/> - <location filename="../libs/libmythtv/videosource.cpp" line="1892"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="1118"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="1555"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="1777"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="1909"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="1121"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="1558"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="1780"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="1912"/> <source>Warning: already in use</source> - <translation>Warning: already in use</translation> + <translation>Warning: Already in Use</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="1107"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="1146"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="1149"/> <source>Subtype</source> <translation>Subtype</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="1116"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="1156"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="1159"/> <source>Frontend ID</source> <translation>Frontend ID</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="1127"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="1168"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="1171"/> <source>Wait for SEQ start header.</source> - <translation>Wait for SEQ start header.</translation> + <translation>Wait for SEQ Start Header</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="1142"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="1183"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="1186"/> <source>Open DVB card on demand</source> - <translation>Open DVB card on demand</translation> + <translation>Open DVB Card on Demand</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="1190"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="1230"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="1233"/> <source>GUID</source> <translation>GUID</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="1215"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="1254"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="1257"/> <source>Cable box model</source> - <translation>Cable box model</translation> + <translation>Cable Box Model</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="1815"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="1849"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="1852"/> <source>URL of M3U containing RTSP/RTP/UDP channel URLs.</source> <translation>URL of M3U containing RTSP/RTP/UDP channel URLs.</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="2994"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="2915"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2925"/> <source>DVB-T/S/C, ATSC or ISDB-T tuner card</source> - <translation>DVB-T/S/C, ATSC or ISDB-T tuner card</translation> + <translation>DVB-T/S/C, ATSC or ISDB-T Tuner Card</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="3002"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="2923"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2933"/> <source>HD-PVR H.264 encoder</source> - <translation>HD-PVR H.264 encoder</translation> + <translation>HD-PVR H.264 Encoder</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="3008"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="2929"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2939"/> <source>HDHomeRun networked tuner</source> - <translation>HDHomeRun networked tuner</translation> + <translation>HDHomeRun Networked Tuner</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="3023"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="2944"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2954"/> <source>Ceton Cablecard tuner</source> - <translation>Ceton Cablecard tuner</translation> + <translation>Ceton Cablecard Tuner</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="3027"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="2948"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2958"/> <source>IPTV recorder</source> - <translation>IPTV recorder</translation> + <translation>IPTV Recorder</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="3033"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="2954"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2964"/> <source>Analog to MPEG-2 encoder card (PVR-150/250/350, etc)</source> - <translation>Analog to MPEG-2 encoder card (PVR-150/250/350, etc)</translation> + <translation>Analog to MPEG-2 Encoder Card (PVR-150/250/350, etc)</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="3036"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="2957"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2967"/> <source>Analog to MJPEG encoder card (Matrox G200, DC10, etc)</source> - <translation>Analog to MJPEG encoder card (Matrox G200, DC10, etc)</translation> + <translation>Analog to MJPEG Encoder Card (Matrox G200, DC10, etc)</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="3038"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="2959"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2969"/> <source>Analog to MPEG-4 encoder (Plextor ConvertX USB, etc)</source> - <translation>Analog to MPEG-4 encoder (Plextor ConvertX USB, etc)</translation> + <translation>Analog to MPEG-4 Encoder (Plextor ConvertX USB, etc)</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="3041"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="2962"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2972"/> <source>Analog capture card</source> - <translation>Analog capture card</translation> + <translation>Analog Capture Card</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="3179"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="3108"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="3118"/> <source>Generic</source> <translation>Generic</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="1233"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="1272"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="1275"/> <source>Choose the model that most closely resembles your set top box. Depending on firmware revision SA4200HD may work better for a SA3250HD box.</source> <translation>Choose the model that most closely resembles your set top box. Depending on firmware revision SA4200HD may work better for a SA3250HD box.</translation> </message> @@ -17369,7 +17470,7 @@ <source>You MUST run 'mythfilldatabase --manual' the first time, instead of just 'mythfilldatabase'. Your grabber does not provide channel numbers, so you have to set them manually.</source> -@@ -18607,472 +19117,481 @@ +@@ -18607,472 +19153,475 @@ Your grabber does not provide channel numbers, so you have to set them manually.</translation> </message> <message> @@ -17380,97 +17481,97 @@ </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="1037"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="1076"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="1079"/> <source>DVB device</source> - <translation>DVB device</translation> + <translation>DVB Device</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="1216"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="1255"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="1258"/> <source>Motorola Generic</source> <translation>Motorola Generic</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="1217"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="1256"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="1259"/> <source>SA/Cisco Generic</source> <translation>SA/Cisco Generic</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="1274"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="1313"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="1316"/> <source>Connection Type</source> <translation>Connection Type</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="1275"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="1314"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="1317"/> <source>Point to Point</source> <translation>Point to Point</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="1287"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="1326"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="1329"/> <source>Speed</source> <translation>Speed</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="1288"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="1327"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="1330"/> <source>100Mbps</source> <translation>100Mbps</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="1289"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="1328"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="1331"/> <source>200Mbps</source> <translation>200Mbps</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="1290"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="1329"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="1332"/> <source>400Mbps</source> <translation>400Mbps</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="1291"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="1330"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="1333"/> <source>800Mbps</source> <translation>800Mbps</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="1340"/> - <location filename="../libs/libmythtv/videosource.cpp" line="1596"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="1367"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="1627"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="1370"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="1630"/> <source>IP Address</source> <translation>IP Address</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="1376"/> - <location filename="../libs/libmythtv/videosource.cpp" line="1628"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="1403"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="1659"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="1406"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="1662"/> <source>Tuner</source> <translation>Tuner</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="1813"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="1847"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="1850"/> <source>M3U URL</source> <translation>M3U URL</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="1850"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="1867"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="1870"/> <source>ASI device</source> - <translation>ASI device</translation> + <translation>ASI Device</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="1909"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="1926"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="1929"/> <source>Warning: unable to open</source> - <translation>Warning: unable to open</translation> + <translation>Warning: Unable to Open</translation> @@ -17485,147 +17586,147 @@ </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="2787"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="2714"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2724"/> <source>Capture Card Setup</source> <translation>Capture Card Setup</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="2984"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="2905"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2915"/> <source>Card type</source> - <translation>Card type</translation> + <translation>Card Type</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="2985"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="2906"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2916"/> <source>Change the cardtype to the appropriate type for the capture card you are configuring.</source> - <translation>Change the cardtype to the appropriate type for the capture card you are configuring.</translation> + <translation>Change the card type to the appropriate type for the capture card you are configuring.</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="3018"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="2939"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2949"/> <source>FireWire cable box</source> - <translation>FireWire cable box</translation> + <translation>FireWire Cable Box</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="3045"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="2966"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2976"/> <source>DVEO ASI recorder</source> - <translation>DVEO ASI recorder</translation> + <translation>DVEO ASI Recorder</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="3109"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="3038"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="3048"/> <source>Video source</source> - <translation>Video source</translation> + <translation>Video Source</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="3135"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="3064"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="3074"/> <source>Leave as 'Generic' unless this input is shared with another device. Only one of the inputs in an input group will be allowed to record at any given time.</source> <translation>Leave as 'Generic' unless this input is shared with another device. Only one of the inputs in an input group will be allowed to record at any given time.</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="3258"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="3189"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="3199"/> <source>Use quick tuning</source> - <translation>Use quick tuning</translation> + <translation>Use Quick Tuning</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="3259"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="3190"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="3200"/> <source>Never</source> <translation>Never</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="3260"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="3191"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="3201"/> <source>Live TV only</source> - <translation>Live TV only</translation> + <translation>Live TV Only</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="3261"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="3192"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="3202"/> <source>Always</source> <translation>Always</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="3280"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="3209"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="3219"/> <source>External channel change command</source> - <translation>External channel change command</translation> + <translation>External Channel Change Command</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="3282"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="3211"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="3221"/> <source>If specified, this command will be run to change the channel for inputs which have an external tuner device such as a cable box. The first argument will be the channel number.</source> <translation>If specified, this command will be run to change the channel for inputs which have an external tuner device such as a cable box. The first argument will be the channel number.</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="3296"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="3224"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="3234"/> <source>Preset tuner to channel</source> - <translation>Preset tuner to channel</translation> + <translation>Preset Tuner to Channel</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="3298"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="3226"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="3236"/> <source>Leave this blank unless you have an external tuner that is connected to the tuner input of your card. If so, you will need to specify the preset channel for the signal (normally 3 or 4).</source> <translation>Leave this blank unless you have an external tuner that is connected to the tuner input of your card. If so, you will need to specify the preset channel for the signal (normally 3 or 4).</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="3349"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="3278"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="3288"/> <source>Input priority</source> - <translation>Input priority</translation> + <translation>Input Priority</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="3351"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="3280"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="3290"/> <source>If the input priority is not equal for all inputs, the scheduler may choose to record a show at a later time so that it can record on an input with a higher value.</source> <translation>If the input priority is not equal for all inputs, the scheduler may choose to record a show at a later time so that it can record on an input with a higher value.</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="3365"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="3294"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="3304"/> <source>Schedule order</source> - <translation>Schedule order</translation> + <translation>Schedule Order</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="3367"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="3296"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="3306"/> <source>If priorities and other factors are equal the scheduler will choose the available input with the lowest, non-zero value. Setting this value to zero will make the input unavailable to the scheduler.</source> - <translation>If priorities and other factors are equal the scheduler will choose the available input with the lowest, non-zero value. Setting this value to zero will make the input unavailable to the scheduler.</translation> + <translation>If priorities and other factors are equal the scheduler will choose the available input with the lowest, non-zero value. Setting this value to zero will make the input unavailable to the scheduler.</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="3382"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="3311"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="3321"/> <source>Live TV order</source> - <translation>Live TV order</translation> + <translation>Live TV Order</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="3384"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="3313"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="3323"/> <source>When entering Live TV, the available, local input with the lowest, non-zero value will be used. If no local inputs are available, the available, remote input with the lowest, non-zero value will be used. Setting this value to zero will make the input unavailable to live TV.</source> - <translation>When entering Live TV, the available, local input with the lowest, non-zero value will be used. If no local inputs are available, the available, remote input with the lowest, non-zero value will be used. Setting this value to zero will make the input unavailable to live TV.</translation> + <translation>When entering Live TV, the available, local input with the lowest, non-zero value will be used. If no local inputs are available, the available, remote input with the lowest, non-zero value will be used. Setting this value to zero will make the input unavailable to live TV.</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="3404"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="3333"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="3343"/> <source>If you point your satellite dish toward DishNet's birds, you may wish to enable this feature. For best results, enable general EIT collection as well.</source> <translation>If you point your satellite dish toward DishNet's birds, you may wish to enable this feature. For best results, enable general EIT collection as well.</translation> </message> @@ -17637,48 +17738,48 @@ </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="3479"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="3394"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="3404"/> <source>Interactions between inputs</source> - <translation>Interactions between inputs</translation> + <translation>Interactions Between Inputs</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="3485"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="3407"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="3417"/> <source>Create a New Input Group</source> <translation>Create a New Input Group</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="3767"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="3796"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="3806"/> <source>(New capture card)</source> - <translation>(New capture card)</translation> + <translation>(New Capture Card)</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="3768"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="3797"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="3807"/> <source>(Delete all capture cards on %1)</source> - <translation>(Delete all capture cards on %1)</translation> + <translation>(Delete All Capture Cards on %1)</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="3770"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="3800"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="3810"/> <source>(Delete all capture cards)</source> - <translation>(Delete all capture cards)</translation> + <translation>(Delete All Capture Cards)</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="3912"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="3813"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="3823"/> <source>(New video source)</source> - <translation>(New video source)</translation> + <translation>(New Video Source)</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="3913"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="3814"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="3824"/> <source>(Delete all video sources)</source> - <translation>(Delete all video sources)</translation> + <translation>(Delete All Video Sources)</translation> @@ -17704,11 +17805,6 @@ </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="686"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="663"/> -+ <source>This will usually only work with ATSC or DVB channels, and generally provides data only for the next few days.</source> -+ <translation>This will usually only work with ATSC or DVB channels, and generally provides data only for the next few days.</translation> -+ </message> -+ <message> + <location filename="../libs/libmythtv/videosource.cpp" line="699"/> <source>Video Source Setup</source> <translation>Video Source Setup</translation> @@ -17721,243 +17817,243 @@ </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="926"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="967"/> <source>Arguments</source> - <translation>Arguments</translation> +- <translation>Arguments</translation> ++ <translation type="vanished">Arguments</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="937"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="979"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="982"/> <source>File path</source> - <translation>File path</translation> + <translation>File Path</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="959"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="1001"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="1004"/> <source>Device to read audio from, if audio is separate from the video.</source> <translation>Device to read audio from, if audio is separate from the video.</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="971"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="1012"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="1015"/> <source>Signal timeout (ms)</source> - <translation>Signal timeout (ms)</translation> + <translation>Signal Timeout (ms)</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="973"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="1014"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="1017"/> <source>Maximum time (in milliseconds) MythTV waits for a signal when scanning for channels.</source> <translation>Maximum time (in milliseconds) MythTV waits for a signal when scanning for channels.</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="986"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="1027"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="1030"/> <source>Tuning timeout (ms)</source> - <translation>Tuning timeout (ms)</translation> + <translation>Tuning Timeout (ms)</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="988"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="1029"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="1032"/> <source>Maximum time (in milliseconds) MythTV waits for a channel lock. For recordings, if this time is exceeded, the recording will be marked as failed.</source> - <translation>Maximum time (in milliseconds) MythTV waits for a channel lock. For recordings, if this time is exceeded, the recording will be marked as failed.</translation> + <translation>Maximum time (in milliseconds) MythTV waits for a channel lock. For recordings, if this time is exceeded, the recording will be marked as failed.</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="1002"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="1042"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="1045"/> <source>Force audio sampling rate</source> - <translation>Force audio sampling rate</translation> + <translation>Force Audio Sampling Rate</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="1004"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="1044"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="1047"/> <source>If non-zero, override the audio sampling rate in the recording profile when this card is used. Use this if your capture card does not support all of the standard rates.</source> - <translation>If non-zero, override the audio sampling rate in the recording profile when this card is used. Use this if your capture card does not support all of the standard rates.</translation> + <translation>If non-zero, override the audio sampling rate in the recording profile when this card is used. Use this if your capture card does not support all of the standard rates.</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="1130"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="1171"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="1174"/> <source>If enabled, drop packets from the start of a DVB recording until a sequence start header is seen.</source> <translation>If enabled, drop packets from the start of a DVB recording until a sequence start header is seen.</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="1145"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="1186"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="1189"/> <source>If enabled, only open the DVB card when required, leaving it free for other programs at other times.</source> <translation>If enabled, only open the DVB card when required, leaving it free for other programs at other times.</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="1157"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="1198"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="1201"/> <source>Use DVB card for active EIT scan</source> - <translation>Use DVB card for active EIT scan</translation> + <translation>Use DVB Card for Active EIT Scan</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="1160"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="1201"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="1204"/> <source>If enabled, activate active scanning for program data (EIT). When this option is enabled the DVB card is constantly in-use.</source> <translation>If enabled, activate active scanning for program data (EIT). When this option is enabled the DVB card is constantly in-use.</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="1173"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="1214"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="1217"/> <source>DVB tuning delay (ms)</source> - <translation>DVB tuning delay (ms)</translation> + <translation>DVB Tuning Delay (ms)</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="1176"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="1217"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="1220"/> <source>Some Linux DVB drivers, in particular for the Hauppauge Nova-T, require that we slow down the tuning process by specifying a delay (in milliseconds).</source> <translation>Some Linux DVB drivers, in particular for the Hauppauge Nova-T, require that we slow down the tuning process by specifying a delay (in milliseconds).</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="1471"/> - <location filename="../libs/libmythtv/videosource.cpp" line="1707"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="1500"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="1740"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="1503"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="1743"/> <source>Available devices</source> - <translation>Available devices</translation> + <translation>Available Devices</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="1473"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="1502"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="1505"/> <source>Device ID and Tuner Number of available HDHomeRun devices.</source> <translation>Device ID and Tuner Number of available HDHomeRun devices.</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="1597"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="1628"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="1631"/> <source>Device IP or ID of a VBox device. eg. '192.168.1.100' or 'vbox_3718'</source> <translation>Device IP or ID of a VBox device. eg. '192.168.1.100' or 'vbox_3718'</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="1629"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="1660"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="1663"/> <source>Number and type of the tuner to use. eg '1-DVBT/T2'.</source> <translation>Number and type of the tuner to use. eg '1-DVBT/T2'.</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="1709"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="1742"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="1745"/> <source>Device IP or ID, tuner number and tuner type of available VBox devices.</source> <translation>Device IP or ID, tuner number and tuner type of available VBox devices.</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="2701"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="2053"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2056"/> + <source>Use HD HomeRun for active EIT scan</source> + <translation>Use HD HomeRun for Active EIT Scan</translation> + </message> + <message> -+ <location filename="../libs/libmythtv/videosource.cpp" line="2056"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2059"/> + <source>If enabled, activate active scanning for program data (EIT). When this option is enabled the HD HomeRun is constantly in-use.</source> + <translation>If enabled, activate active scanning for program data (EIT). When this option is enabled the HD HomeRun is constantly in-use.</translation> + </message> + <message> -+ <location filename="../libs/libmythtv/videosource.cpp" line="2646"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2656"/> <source>V4L2 encoder devices (multirec capable)</source> - <translation>V4L2 encoder devices (multirec capable)</translation> + <translation>V4L2 Encoder Devices (multirec capable)</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="2999"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="2920"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2930"/> <source>V4L2 encoder</source> - <translation>V4L2 encoder</translation> + <translation>V4L2 Encoder</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="3013"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="2934"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2944"/> <source>V@Box TV Gateway networked tuner</source> - <translation>V@Box TV Gateway networked tuner</translation> + <translation>V@Box TV Gateway Networked Tuner</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="3048"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="2969"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2979"/> <source>Import test recorder</source> - <translation>Import test recorder</translation> + <translation>Import Test Recorder</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="3049"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="2970"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2980"/> <source>Demo test recorder</source> - <translation>Demo test recorder</translation> + <translation>Demo Test Recorder</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="3051"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="2972"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2982"/> <source>External (black box) recorder</source> - <translation>External (black box) recorder</translation> + <translation>External (black box) Recorder</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="3062"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="2983"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2993"/> <source>Input name</source> - <translation>Input name</translation> + <translation>Input Name</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="3094"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="3014"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="3024"/> <source>Display name (optional)</source> - <translation>Display name (optional)</translation> + <translation>Display Name (optional)</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="3095"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="3015"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="3025"/> <source>This name is displayed on screen when Live TV begins and when changing the selected input or card. If you use this, make sure the information is unique for each input.</source> <translation>This name is displayed on screen when Live TV begins and when changing the selected input or card. If you use this, make sure the information is unique for each input.</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="3133"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="3062"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="3072"/> <source>Input group</source> - <translation>Input group</translation> + <translation>Input Group</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="3262"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="3193"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="3203"/> <source>If enabled, MythTV will tune using only the MPEG program number. The program numbers change more often than DVB or ATSC tuning parameters, so this is slightly less reliable. This will also inhibit EIT gathering during Live TV and recording.</source> <translation>If enabled, MythTV will tune using only the MPEG program number. The program numbers change more often than DVB or ATSC tuning parameters, so this is slightly less reliable. This will also inhibit EIT gathering during Live TV and recording.</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="3401"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="3330"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="3340"/> <source>Use DishNet long-term EIT data</source> - <translation>Use DishNet long-term EIT data</translation> + <translation>Use DishNet Long-Term EIT Data</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="3487"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="3409"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="3419"/> <source>Input groups are only needed when two or more cards share the same resource such as a FireWire card and an analog card input controlling the same set top box.</source> <translation>Input groups are only needed when two or more cards share the same resource such as a FireWire card and an analog card input controlling the same set top box.</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="4237"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="4089"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="4099"/> <source>Audio input</source> - <translation>Audio input</translation> + <translation>Audio Input</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="4238"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="4090"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="4100"/> <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> @@ -18001,7 +18097,7 @@ <source>This is updated on every successful channel change.</source> <translation>This is updated on every successful channel change.</translation> </message> -@@ -19082,48 +19601,48 @@ +@@ -19082,48 +19631,48 @@ <translation>The following programs will be recorded instead:</translation> </message> <message> @@ -18062,12 +18158,12 @@ </message> <message> <location filename="../programs/mythfrontend/setupwizard_audio.cpp" line="295"/> -@@ -19136,24 +19655,23 @@ +@@ -19136,24 +19685,23 @@ <translation>Audio device is invalid or not useable.</translation> </message> <message> - <location filename="../libs/libmyth/programinfo.cpp" line="3126"/> -+ <location filename="../libs/libmyth/programinfo.cpp" line="3149"/> ++ <location filename="../libs/libmyth/programinfo.cpp" line="3140"/> <source>Delete</source> <translation>Delete</translation> </message> @@ -18079,7 +18175,7 @@ </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="759"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="831"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="832"/> <source>Use 'mythfilldatabase' or the name of a custom script that will populate the program guide info for all your video sources.</source> <translation>Use 'mythfilldatabase' or the name of a custom script that will populate the program guide info for all your video sources.</translation> </message> @@ -18091,7 +18187,7 @@ </message> <message> <location filename="../libs/libmyth/mythmediamonitor.cpp" line="37"/> -@@ -19161,12 +19679,12 @@ +@@ -19161,12 +19709,12 @@ <translation>Media Monitor</translation> </message> <message> @@ -18106,7 +18202,7 @@ <source>You may have to use the eject button under its tray</source> <translation>You may have to use the eject button under its tray</translation> </message> -@@ -19182,722 +19700,770 @@ +@@ -19182,722 +19730,769 @@ </message> <message> <location filename="../programs/mythtranscode/main.cpp" line="97"/> @@ -18137,10 +18233,10 @@ </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="109"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="187"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="188"/> <source>IP address</source> - <translation>IP address</translation> -+ <translation>Ip Address</translation> ++ <translation>IP Address</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="26"/> @@ -18162,245 +18258,244 @@ </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="144"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="129"/> + <source>Listen on All IP Addresses</source> -+ <translation>Listen on All IP Addresses</translation> ++ <translation type="vanished">Listen on All IP Addresses</translation> + </message> + <message> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="170"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="171"/> + <source>Primary IP address / DNS name</source> + <translation>Primary IP Address/DNS Name</translation> + </message> + <message> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="172"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="173"/> + <source>The Primary IP address of this backend server. You can select an IP address from the list or type a DNS name or host name. Other systems will contact this server using this address. If you use a host name make sure it is assigned an ip address other than 127.0.0.1 in the hosts file.</source> -+ <translation>The Primary IP address of this backend server. You can select an IP address from the list or type a DNS name or hostname. Other systems will contact this server using this address. If you use a hostname make sure it is assigned an ip address other than 127.0.0.1 in the hosts file.</translation> ++ <translation>The Primary IP address of this backend server. You can select an IP address from the list or type a DNS name or hostname. Other systems will contact this server using this address. If you use a hostname make sure it is assigned an IP address other than 127.0.0.1 in the hosts file.</translation> + </message> + <message> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="216"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="217"/> <source>TV format</source> - <translation>TV format</translation> + <translation>TV Format</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="150"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="222"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="223"/> <source>The TV standard to use for viewing TV.</source> <translation>The TV standard to use for viewing TV.</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="157"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="229"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="230"/> <source>VBI format</source> - <translation>VBI format</translation> + <translation>VBI Format</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="184"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="256"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="257"/> <source>Save original files after transcoding (globally)</source> <translation>Save original files after transcoding (globally)</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="195"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="267"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="268"/> <source>Delete files slowly</source> - <translation>Delete files slowly</translation> + <translation>Delete Files Slowly</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="207"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="279"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="280"/> <source>Follow symbolic links when deleting files</source> - <translation>Follow symbolic links when deleting files</translation> + <translation>Follow Symbolic Links When Deleting Files</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="237"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="309"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="310"/> <source>Combination</source> <translation>Combination</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="263"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="335"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="336"/> <source>By default, MythTV resets the FireWire bus when a FireWire recorder stops responding to commands. If this causes problems, you can disable this behavior here.</source> <translation>By default, MythTV resets the FireWire bus when a FireWire recorder stops responding to commands. If this causes problems, you can disable this behavior here.</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="314"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="386"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="387"/> <source>The minimum number of seconds after a recorder becomes idle to wait before MythTV begins collecting EIT listings data.</source> <translation>The minimum number of seconds after a recorder becomes idle to wait before MythTV begins collecting EIT listings data.</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="324"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="396"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="397"/> <source>Delay between wake attempts (secs)</source> - <translation>Delay between wake attempts (secs)</translation> + <translation>Delay Between Wake Attempts (secs)</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="337"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="409"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="410"/> <source>Number of times the frontend will try to wake up the master backend.</source> <translation>Number of times the frontend will try to wake up the master backend.</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="358"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="420"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="421"/> + <source>The command used to wake up your master backend server (e.g. wakeonlan 00:00:00:00:00:00).</source> + <translation>The command used to wake up your master backend server (e.g. wakeonlan 00:00:00:00:00:00).</translation> + </message> + <message> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="430"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="431"/> <source>The command used to put this slave to sleep. If set, the master backend will use this command to put this slave to sleep when it is not needed for recording.</source> <translation>The command used to put this slave to sleep. If set, the master backend will use this command to put this slave to sleep when it is not needed for recording.</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="400"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="472"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="473"/> <source>Idle shutdown timeout (secs)</source> - <translation>Idle shutdown timeout (secs)</translation> + <translation>Idle Shutdown Timeout (secs)</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="413"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="485"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="486"/> <source>The number of minutes the master backend waits for a recording. If the backend is idle but a recording starts within this time period, it won't shut down.</source> <translation>The number of minutes the master backend waits for a recording. If the backend is idle but a recording starts within this time period, it won't shut down.</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="433"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="505"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="506"/> <source>Wakeup time format</source> - <translation>Wakeup time format</translation> + <translation>Wakeup Time Format</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="447"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="519"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="520"/> <source>The command used to set the wakeup time (passed as $time) for the Master Backend</source> <translation>The command used to set the wakeup time (passed as $time) for the Master Backend</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="455"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="527"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="528"/> <source>Server halt command</source> - <translation>Server halt command</translation> + <translation>Server Halt Command</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="457"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="529"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="530"/> <source>The command used to halt the backends.</source> <translation>The command used to halt the backends.</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="466"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="538"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="539"/> <source>A command executed before the backend would shutdown. The return value determines if the backend can shutdown. 0 - yes, 1 - restart idling, 2 - reset the backend to wait for a frontend.</source> <translation>A command executed before the backend would shutdown. The return value determines if the backend can shutdown. 0 - yes, 1 - restart idling, 2 - reset the backend to wait for a frontend.</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="477"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="549"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="550"/> <source>Block shutdown before client connected</source> - <translation>Block shutdown before client connected</translation> + <translation>Block Shutdown Before Client Connected</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="487"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="559"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="560"/> <source>Startup command</source> - <translation>Startup command</translation> + <translation>Startup Command</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="489"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="561"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="562"/> <source>This command is executed right after starting the BE. As a parameter '$status' is replaced by either 'auto' if the machine was started automatically or 'user' if a user switched it on.</source> <translation>This command is executed right after starting the BE. As a parameter '$status' is replaced by either 'auto' if the machine was started automatically or 'user' if a user switched it on.</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="499"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="571"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="572"/> <source>Maximum simultaneous jobs on this backend</source> - <translation>Maximum simultaneous jobs on this backend</translation> + <translation>Maximum Simultaneous Jobs on This Backend</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="500"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="572"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="573"/> <source>The Job Queue will be limited to running this many simultaneous jobs on this backend.</source> <translation>The Job Queue will be limited to running this many simultaneous jobs on this backend.</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="520"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="592"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="593"/> <source>Low</source> <translation>Low</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="521"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="593"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="594"/> <source>Medium</source> <translation>Medium</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="592"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="664"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="665"/> <source>The command to run whenever this User Job number is scheduled.</source> <translation>The command to run whenever this User Job number is scheduled.</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="602"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="674"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="675"/> <source>User Job #%1</source> <translation>User Job #%1</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="640"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="712"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="713"/> <source>Transcoder command</source> - <translation>Transcoder command</translation> + <translation>Transcoder Command</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="642"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="714"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="715"/> <source>The program used to transcode recordings. The default is 'mythtranscode' if this setting is empty.</source> <translation>The program used to transcode recordings. The default is 'mythtranscode' if this setting is empty.</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="662"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="734"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="735"/> <source>Allow %1 jobs</source> <translation>Allow %1 jobs</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="685"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="757"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="758"/> <source>If enabled, the master backend will include the list of recorded shows in the list of videos. This is mainly to accommodate UPnP players which do not allow more than 1 video section.</source> - <translation>If enabled, the master backend will include the list of recorded shows in the list of videos. This is mainly to accommodate UPnP players which do not allow more than 1 video section.</translation> + <translation>If enabled, the master backend will include the list of recorded shows in the list of videos. This is mainly to accommodate UPnP players which do not allow more than 1 video section.</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="697"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="769"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="770"/> <source>Recordings</source> <translation>Recordings</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="698"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="770"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="771"/> <source>Videos</source> <translation>Videos</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="90"/> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="124"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="151"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="152"/> <source>Unless you've got good reason, don't change this.</source> <translation>Unless you've got good reason, don't change this.</translation> </message> @@ -18413,14 +18508,14 @@ </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="98"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="159"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="160"/> <source>Status port</source> - <translation>Status port</translation> + <translation>Status Port</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="100"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="161"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="162"/> <source>Port on which the server will listen for HTTP requests, including backend status and MythXML requests.</source> <translation>Port on which the server will listen for HTTP requests, including backend status and MythXML requests.</translation> </message> @@ -18432,206 +18527,206 @@ </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="132"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="204"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="205"/> <source>Security PIN (required)</source> <translation>Security PIN (required)</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="134"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="206"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="207"/> <source>PIN code required for a frontend to connect to the backend. Blank prevents all connections; 0000 allows any client to connect.</source> <translation>PIN code required for a frontend to connect to the backend. Blank prevents all connections; 0000 allows any client to connect.</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="161"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="233"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="234"/> <source>The VBI (Vertical Blanking Interval) is used to carry Teletext or Closed Captioning data.</source> <translation>The VBI (Vertical Blanking Interval) is used to carry Teletext or Closed Captioning data.</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="175"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="247"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="248"/> <source>Select the appropriate frequency table for your system. If you have an antenna, use a "-bcast" frequency.</source> <translation>Select the appropriate frequency table for your system. If you have an antenna, use a "-bcast" frequency.</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="186"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="258"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="259"/> <source>If enabled and the transcoder is active, the original files will be renamed to .old once the transcoding is complete.</source> <translation>If enabled and the transcoder is active, the original files will be renamed to .old once the transcoding is complete.</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="197"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="269"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="270"/> <source>Some filesystems use a lot of resources when deleting large files. If enabled, this option makes MythTV delete files slowly on this backend to lessen the impact.</source> <translation>Some filesystems use a lot of resources when deleting large files. If enabled, this option makes MythTV delete files slowly on this backend to lessen the impact.</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="209"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="281"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="282"/> <source>If enabled, MythTV will follow symlinks when recordings and related files are deleted, instead of deleting the symlink and leaving the actual file.</source> <translation>If enabled, MythTV will follow symlinks when recordings and related files are deleted, instead of deleting the symlink and leaving the actual file.</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="219"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="291"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="292"/> <source>HD ringbuffer size (kB)</source> - <translation>HD ringbuffer size (kB)</translation> + <translation>HD Ringbuffer Size (kB)</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="220"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="292"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="293"/> <source>The HD device ringbuffer allows the backend to weather moments of stress. The larger the ringbuffer (in kilobytes), the longer the moments of stress can be. However, setting the size too large can cause swapping, which is detrimental.</source> <translation>The HD device ringbuffer allows the backend to weather moments of stress. The larger the ringbuffer (in kilobytes), the longer the moments of stress can be. However, setting the size too large can cause swapping, which is detrimental.</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="233"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="305"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="306"/> <source>Storage Group disk scheduler</source> - <translation>Storage Group disk scheduler</translation> + <translation>Storage Group Disk Scheduler</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="234"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="306"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="307"/> <source>Balanced free space</source> - <translation>Balanced free space</translation> + <translation>Balanced Free Space</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="235"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="307"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="308"/> <source>Balanced percent free space</source> - <translation>Balanced percent free space</translation> + <translation>Balanced Percent Free Space</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="236"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="308"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="309"/> <source>Balanced disk I/O</source> - <translation>Balanced disk I/O</translation> + <translation>Balanced Disk I/O</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="239"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="311"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="312"/> <source>This setting controls how the Storage Group scheduling code will balance new recordings across directories. 'Balanced Free Space' is the recommended method for most users.</source> <translation>This setting controls how the Storage Group scheduling code will balance new recordings across directories. 'Balanced Free Space' is the recommended method for most users.</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="249"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="321"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="322"/> <source>Disable automatic database backup</source> - <translation>Disable automatic database backup</translation> + <translation>Disable Automatic Database Backup</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="251"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="323"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="324"/> <source>If enabled, MythTV will not backup the database before upgrades. You should therefore have your own database backup strategy in place.</source> <translation>If enabled, MythTV will not backup the database before upgrades. You should therefore have your own database backup strategy in place.</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="261"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="333"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="334"/> <source>Disable FireWire reset</source> - <translation>Disable FireWire reset</translation> + <translation>Disable FireWire Reset</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="275"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="347"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="348"/> <source>Miscellaneous status application</source> - <translation>Miscellaneous status application</translation> + <translation>Miscellaneous Status Application</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="277"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="349"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="350"/> <source>External application or script that outputs extra information for inclusion in the backend status page. See http://www.mythtv.org/wiki/Miscellaneous_Status_Information</source> <translation>External application or script that outputs extra information for inclusion in the backend status page. See http://www.mythtv.org/wiki/Miscellaneous_Status_Information</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="700"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="772"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="773"/> <source>Which tree to show a Windows Media Player client when it requests a list of videos.</source> <translation>Which tree to show a Windows Media Player client when it requests a list of videos.</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="708"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="780"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="781"/> <source>Automatically update program listings</source> - <translation>Automatically update program listings</translation> + <translation>Automatically Update Program Listings</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="710"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="782"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="783"/> <source>If enabled, the guide data program will be run automatically.</source> <translation>If enabled, the guide data program will be run automatically.</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="718"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="790"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="791"/> <source>Guide data program execution start</source> - <translation>Guide data program execution start</translation> + <translation>Guide Data Program Execution Start</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="720"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="792"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="793"/> <source>This setting and the following one define a time period when the guide data program is allowed to run. For example, setting start to 11 and end to 13 would mean that the program would only run between 11:00 AM and 1:59 PM.</source> <translation>This setting and the following one define a time period when the guide data program is allowed to run. For example, setting start to 11 and end to 13 would mean that the program would only run between 11:00 AM and 1:59 PM.</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="731"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="803"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="804"/> <source>Guide data program execution end</source> - <translation>Guide data program execution end</translation> + <translation>Guide Data Program Execution End</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="733"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="805"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="806"/> <source>This setting and the preceding one define a time period when the guide data program is allowed to run. For example, setting start to 11 and end to 13 would mean that the program would only run between 11:00 AM and 1:59 PM.</source> <translation>This setting and the preceding one define a time period when the guide data program is allowed to run. For example, setting start to 11 and end to 13 would mean that the program would only run between 11:00 AM and 1:59 PM.</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="744"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="816"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="817"/> <source>Run guide data program at time suggested by the grabber.</source> <translation>Run guide data program at time suggested by the grabber.</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="747"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="819"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="820"/> <source>If enabled, allow a DataDirect guide data provider to specify the next download time in order to distribute load on their servers. Guide data program execution start/end times are also ignored.</source> <translation>If enabled, allow a DataDirect guide data provider to specify the next download time in order to distribute load on their servers. Guide data program execution start/end times are also ignored.</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="757"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="829"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="830"/> <source>Guide data program</source> - <translation>Guide data program</translation> + <translation>Guide Data Program</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="769"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="841"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="842"/> <source>Guide data arguments</source> - <translation>Guide data arguments</translation> + <translation>Guide Data Arguments</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="771"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="843"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="844"/> <source>Any arguments you want passed to the guide data program.</source> <translation>Any arguments you want passed to the guide data program.</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="782"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="853"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="854"/> <source>Program Schedule Downloading Options</source> <translation>Program Schedule Downloading Options</translation> </message> @@ -18650,46 +18745,46 @@ </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="287"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="359"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="360"/> <source>EIT transport timeout (mins)</source> - <translation>EIT transport timeout (mins)</translation> + <translation>EIT Transport Timeout (mins)</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="289"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="361"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="362"/> <source>Maximum time to spend waiting (in minutes) for listings data on one digital TV channel before checking for new listings data on the next channel.</source> <translation>Maximum time to spend waiting (in minutes) for listings data on one digital TV channel before checking for new listings data on the next channel.</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="300"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="372"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="373"/> <source>Master backend override</source> - <translation>Master backend override</translation> + <translation>Master Backend Override</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="302"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="374"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="375"/> <source>If enabled, the master backend will stream and delete files if it finds them in a storage directory. Useful if you are using a central storage location, like a NFS share, and your slave backend isn't running.</source> <translation>If enabled, the master backend will stream and delete files if it finds them in a storage directory. Useful if you are using a central storage location, like a NFS share, and your slave backend isn't running.</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="312"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="384"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="385"/> <source>Backend idle before EIT crawl (secs)</source> - <translation>Backend idle before EIT crawl (secs)</translation> + <translation>Backend Idle Before EIT Crawl (secs)</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="326"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="398"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="399"/> <source>Length of time the frontend waits between tries to wake up the master backend. This should be the time your master backend needs to startup. Set to 0 to disable.</source> <translation>Length of time the frontend waits between tries to wake up the master backend. This should be the time your master backend needs to startup. Set to 0 to disable.</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="336"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="408"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="409"/> <source>Wake attempts</source> - <translation>Wake attempts</translation> + <translation>Wake Attempts</translation> @@ -18702,216 +18797,216 @@ </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="356"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="428"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="429"/> <source>Sleep command</source> - <translation>Sleep command</translation> + <translation>Sleep Command</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="369"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="441"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="442"/> <source>The command used to wake up this slave from sleep. This setting is not used on the master backend.</source> <translation>The command used to wake up this slave from sleep. This setting is not used on the master backend.</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="378"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="450"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="451"/> <source>Backend stop command</source> - <translation>Backend stop command</translation> + <translation>Backend Stop Command</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="380"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="452"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="453"/> <source>The command used to stop the backend when running on the master backend server (e.g. sudo /etc/init.d/mythtv-backend stop)</source> <translation>The command used to stop the backend when running on the master backend server (e.g. sudo /etc/init.d/mythtv-backend stop)</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="389"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="461"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="462"/> <source>Backend start command</source> - <translation>Backend start command</translation> + <translation>Backend Start Command</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="391"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="463"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="464"/> <source>The command used to start the backend when running on the master backend server (e.g. sudo /etc/init.d/mythtv-backend start).</source> <translation>The command used to start the backend when running on the master backend server (e.g. sudo /etc/init.d/mythtv-backend start).</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="402"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="474"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="475"/> <source>The number of seconds the master backend idles before it shuts down all other backends. Set to 0 to disable automatic shutdown.</source> <translation>The number of seconds the master backend idles before it shuts down all other backends. Set to 0 to disable automatic shutdown.</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="411"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="483"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="484"/> <source>Maximum wait for recording (mins)</source> - <translation>Maximum wait for recording (mins)</translation> + <translation>Maximum Wait for Recording (mins)</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="423"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="495"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="496"/> <source>Startup before recording (secs)</source> - <translation>Startup before recording (secs)</translation> + <translation>Startup Before Recording (secs)</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="425"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="497"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="498"/> <source>The number of seconds the master backend will be woken up before a recording starts.</source> <translation>The number of seconds the master backend will be woken up before a recording starts.</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="435"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="507"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="508"/> <source>The format of the time string passed to the 'Command to set wakeup time' as $time. See QT::QDateTime.toString() for details. Set to 'time_t' for seconds since epoch.</source> <translation>The format of the time string passed to the 'Command to set wakeup time' as $time. See QT::QDateTime.toString() for details. Set to 'time_t' for seconds since epoch.</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="445"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="517"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="518"/> <source>Command to set wakeup time</source> - <translation>Command to set wakeup time</translation> + <translation>Command to Set Wakeup Time</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="464"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="536"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="537"/> <source>Pre-shutdown-check command</source> - <translation>Pre-shutdown-check command</translation> + <translation>Pre-shutdown Check Command</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="479"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="551"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="552"/> <source>If enabled, the automatic shutdown routine will be disabled until a client connects.</source> <translation>If enabled, the automatic shutdown routine will be disabled until a client connects.</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="509"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="581"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="582"/> <source>Job Queue check frequency (secs)</source> - <translation>Job Queue check frequency (secs)</translation> + <translation>Job Queue Check Frequency (secs)</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="510"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="582"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="583"/> <source>When looking for new jobs to process, the Job Queue will wait this many seconds between checks.</source> <translation>When looking for new jobs to process, the Job Queue will wait this many seconds between checks.</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="519"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="591"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="592"/> <source>CPU usage</source> - <translation>CPU usage</translation> + <translation>CPU Usage</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="523"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="595"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="596"/> <source>This setting controls approximately how much CPU jobs in the queue may consume. On 'High', all available CPU time may be used, which could cause problems on slower systems.</source> <translation>This setting controls approximately how much CPU jobs in the queue may consume. On 'High', all available CPU time may be used, which could cause problems on slower systems.</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="533"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="605"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="606"/> <source>Job Queue start time</source> - <translation>Job Queue start time</translation> + <translation>Job Queue Start Time</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="534"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="606"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="607"/> <source>This setting controls the start of the Job Queue time window, which determines when new jobs will be started.</source> <translation>This setting controls the start of the Job Queue time window, which determines when new jobs will be started.</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="543"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="615"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="616"/> <source>Job Queue end time</source> - <translation>Job Queue end time</translation> + <translation>Job Queue End Time</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="544"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="616"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="617"/> <source>This setting controls the end of the Job Queue time window, which determines when new jobs will be started.</source> <translation>This setting controls the end of the Job Queue time window, which determines when new jobs will be started.</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="553"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="625"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="626"/> <source>Run jobs only on original recording backend</source> - <translation>Run jobs only on original recording backend</translation> + <translation>Run Jobs Only on Original Recording Backend</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="555"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="627"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="628"/> <source>If enabled, jobs in the queue will be required to run on the backend that made the original recording.</source> <translation>If enabled, jobs in the queue will be required to run on the backend that made the original recording.</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="564"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="636"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="637"/> <source>Run transcode jobs before auto commercial detection</source> - <translation>Run transcode jobs before auto commercial detection</translation> + <translation>Run Transcode Jobs Before Auto Commercial Detection</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="567"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="639"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="640"/> <source>If enabled, and if both auto-transcode and commercial detection are turned ON for a recording, transcoding will run first; otherwise, commercial detection runs first.</source> <translation>If enabled, and if both auto-transcode and commercial detection are turned ON for a recording, transcoding will run first; otherwise, commercial detection runs first.</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="577"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="649"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="650"/> <source>Start auto-commercial-detection jobs when the recording starts</source> - <translation>Start auto-commercial-detection jobs when the recording starts</translation> + <translation>Start Auto Commercial Detection Jobs When the Recording Starts</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="580"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="652"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="653"/> <source>If enabled, and Auto Commercial Detection is ON for a recording, the flagging job will be started as soon as the recording starts. NOT recommended on underpowered systems.</source> <translation>If enabled, and Auto Commercial Detection is ON for a recording, the flagging job will be started as soon as the recording starts. NOT recommended on underpowered systems.</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="590"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="662"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="663"/> <source>User Job #%1 command</source> - <translation>User Job #%1 command</translation> + <translation>User Job #%1 Command</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="601"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="673"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="674"/> <source>User Job #%1 description</source> - <translation>User Job #%1 description</translation> + <translation>User Job #%1 Description</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="603"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="675"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="676"/> <source>The description for this User Job.</source> <translation>The description for this User Job.</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="610"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="682"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="683"/> <source>Allow metadata lookup jobs</source> - <translation>Allow metadata lookup jobs</translation> + <translation>Allow Metadata Lookup Jobs</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="620"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="692"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="693"/> <source>Allow commercial-detection jobs</source> - <translation>Allow commercial-detection jobs</translation> + <translation>Allow Commercial Detection Jobs</translation> @@ -18921,66 +19016,74 @@ - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="622"/> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="632"/> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="674"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="684"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="694"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="704"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="746"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="685"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="695"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="705"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="747"/> <source>If enabled, allow jobs of this type to run on this backend.</source> <translation>If enabled, allow jobs of this type to run on this backend.</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="630"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="702"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="703"/> <source>Allow transcoding jobs</source> - <translation>Allow transcoding jobs</translation> + <translation>Allow Transcoding Jobs</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="650"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="722"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="723"/> <source>Commercial-detection command</source> - <translation>Commercial-detection command</translation> + <translation>Commercial Detection Command</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="652"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="724"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="725"/> <source>The program used to detect commercials in a recording. The default is 'mythcommflag' if this setting is empty.</source> <translation>The program used to detect commercials in a recording. The default is 'mythcommflag' if this setting is empty.</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="683"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="755"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="756"/> <source>Include recordings in video list</source> - <translation>Include recordings in video list</translation> + <translation>Include Recordings in Video List</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="696"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="768"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="769"/> <source>Video content to show a WMP client</source> - <translation>Video content to show a WMP client</translation> + <translation>Video Content to Show a WMP Client</translation> -+ </message> -+ <message> -+ <source>Host Address Backend Setup</source> + </message> + <message> +- <location filename="../programs/mythtv-setup/backendsettings.cpp" line="804"/> + <source>Host Address Backend Setup</source> +- <translation>Host Address Backend Setup</translation> + <translation type="vanished">Host Address Backend Setup</translation> -+ </message> -+ <message> -+ <source>Local Backend</source> + </message> + <message> +- <location filename="../programs/mythtv-setup/backendsettings.cpp" line="806"/> + <source>Local Backend</source> +- <translation>Local Backend</translation> + <translation type="vanished">Local Backend</translation> -+ </message> -+ <message> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="963"/> -+ <source>Master Backend</source> -+ <translation>Master Backend</translation> -+ </message> -+ <message> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="913"/> -+ <source>Locale Settings</source> -+ <translation>Locale Settings</translation> -+ </message> -+ <message> + </message> + <message> +- <location filename="../programs/mythtv-setup/backendsettings.cpp" line="830"/> +- <location filename="../programs/mythtv-setup/backendsettings.cpp" line="894"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="964"/> + <source>Master Backend</source> + <translation>Master Backend</translation> + </message> + <message> +- <location filename="../programs/mythtv-setup/backendsettings.cpp" line="841"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="914"/> + <source>Locale Settings</source> + <translation>Locale Settings</translation> + </message> + <message> +- <location filename="../programs/mythtv-setup/backendsettings.cpp" line="848"/> + <location filename="../programs/mythtv-setup/backendsettings.cpp" line="15"/> + <source>This server is the Master Backend</source> + <translation>This Server is the Master Backend</translation> @@ -18994,108 +19097,94 @@ + <location filename="../programs/mythtv-setup/backendsettings.cpp" line="30"/> + <source>Master Backend Name</source> + <translation>Master Backend Name</translation> - </message> - <message> -- <location filename="../programs/mythtv-setup/backendsettings.cpp" line="804"/> -- <source>Host Address Backend Setup</source> -- <translation>Host Address Backend Setup</translation> ++ </message> ++ <message> + <location filename="../programs/mythtv-setup/backendsettings.cpp" line="33"/> + <source>Host name of Master Backend. This is set by selecting "This server is the Master Backend" on that server.</source> + <translation>Host name of master backend. This is set by selecting "This server is the master backend" on that server.</translation> - </message> - <message> -- <location filename="../programs/mythtv-setup/backendsettings.cpp" line="806"/> -- <source>Local Backend</source> -- <translation>Local Backend</translation> ++ </message> ++ <message> + <location filename="../programs/mythtv-setup/backendsettings.cpp" line="42"/> + <source>Allow Connections from all Subnets</source> + <translation>Allow Connections from All Subnets</translation> - </message> - <message> -- <location filename="../programs/mythtv-setup/backendsettings.cpp" line="830"/> -- <location filename="../programs/mythtv-setup/backendsettings.cpp" line="894"/> -- <source>Master Backend</source> -- <translation>Master Backend</translation> ++ </message> ++ <message> + <location filename="../programs/mythtv-setup/backendsettings.cpp" line="44"/> + <source>Allow this backend to receive connections from any IP address on the internet. NOT recommended for most users. Use this only if you have secure IPV4 and IPV6 firewalls.</source> + <translation>Allow this backend to receive connections from any IP address on the internet. NOT recommended for most users. Use this only if you have secure IPV4 and IPV6 firewalls.</translation> - </message> - <message> -- <location filename="../programs/mythtv-setup/backendsettings.cpp" line="841"/> -- <source>Locale Settings</source> -- <translation>Locale Settings</translation> ++ </message> ++ <message> + <location filename="../programs/mythtv-setup/backendsettings.cpp" line="76"/> + <source>Listen on IPv6 address</source> + <translation>Listen on IPv6 Address</translation> - </message> - <message> -- <location filename="../programs/mythtv-setup/backendsettings.cpp" line="848"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="920"/> ++ </message> ++ <message> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="921"/> <source>Miscellaneous Settings</source> <translation>Miscellaneous Settings</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="851"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="923"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="924"/> <source>File Management Settings</source> <translation>File Management Settings</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="872"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="941"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="942"/> <source>EIT Scanner Options</source> <translation>EIT Scanner Options</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="878"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="947"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="948"/> <source>Shutdown/Wakeup Options</source> <translation>Shutdown/Wakeup Options</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="891"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="960"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="961"/> <source>Backend Wakeup settings</source> - <translation>Backend Wakeup settings</translation> + <translation>Backend Wakeup Settings</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="901"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="970"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="971"/> <source>Slave Backends</source> <translation>Slave Backends</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="908"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="977"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="978"/> <source>Backend Control</source> <translation>Backend Control</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="914"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="983"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="984"/> <source>Job Queue (Backend-Specific)</source> <translation>Job Queue (Backend-Specific)</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="941"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="999"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="1000"/> <source>Job Queue (Global)</source> <translation>Job Queue (Global)</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="951"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="1009"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="1010"/> <source>Job Queue (Job Commands)</source> <translation>Job Queue (Job Commands)</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="862"/> -+ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="931"/> ++ <location filename="../programs/mythtv-setup/backendsettings.cpp" line="932"/> <source>UPnP Server Settings</source> <translation>UPnP Server Settings</translation> </message> -@@ -19915,12 +20481,12 @@ +@@ -19915,12 +20510,12 @@ <location filename="../programs/mythtv-setup/checksetup.cpp" line="62"/> <location filename="../programs/mythtv-setup/checksetup.cpp" line="86"/> <source>No Storage Group directories are defined. You must add at least one directory to the Default Storage Group where new recordings will be stored.</source> @@ -19110,7 +19199,7 @@ </message> <message> <location filename="../programs/mythtv-setup/checksetup.cpp" line="217"/> -@@ -19928,12 +20494,12 @@ +@@ -19928,12 +20523,12 @@ <translation>Card %1 (type %2) is set to start on channel %3, which does not exist.</translation> </message> <message> @@ -19126,7 +19215,7 @@ <source>MythTV Setup</source> <translation>MythTV Setup</translation> </message> -@@ -19971,19 +20537,19 @@ +@@ -19971,19 +20566,19 @@ <translation>Backlinks</translation> </message> <message> @@ -19149,7 +19238,7 @@ </message> <message> <location filename="../programs/mythfrontend/videolist.cpp" line="646"/> -@@ -19994,7 +20560,7 @@ +@@ -19994,7 +20589,7 @@ <message> <location filename="../programs/mythfrontend/videolist.cpp" line="656"/> <source>No files found</source> @@ -19158,7 +19247,7 @@ </message> <message> <location filename="../programs/mythfrontend/videolist.cpp" line="952"/> -@@ -20075,57 +20641,57 @@ +@@ -20075,57 +20670,57 @@ <translation>videos</translation> </message> <message> @@ -19227,7 +19316,7 @@ <source>%1 KB</source> <translation>%1 KB</translation> </message> -@@ -20150,17 +20716,17 @@ +@@ -20150,17 +20745,17 @@ <message> <location filename="../libs/libmyth/recordingtypes.cpp" line="251"/> <source>Match duplicates using subtitle & description</source> @@ -19248,7 +19337,7 @@ </message> <message> <location filename="../libs/libmyth/recordingtypes.cpp" line="230"/> -@@ -20180,22 +20746,22 @@ +@@ -20180,22 +20775,22 @@ <message> <location filename="../libs/libmyth/recordingtypes.cpp" line="249"/> <source>Match duplicates using description</source> @@ -19275,7 +19364,7 @@ </message> <message> <location filename="../libs/libmyth/recordingtypes.cpp" line="160"/> -@@ -20221,90 +20787,90 @@ +@@ -20221,90 +20816,90 @@ <message> <location filename="../libs/libmyth/recordingtypes.cpp" line="179"/> <source>Look for duplicates in previous recordings only</source> @@ -19398,7 +19487,7 @@ <source>Run '%1'</source> <translation>Run '%1'</translation> </message> -@@ -20335,97 +20901,97 @@ +@@ -20335,97 +20930,97 @@ <translation>SetParameters() called with handle == NULL!</translation> </message> <message> @@ -19518,7 +19607,7 @@ <source>film</source> <translation>film</translation> </message> -@@ -20433,56 +20999,56 @@ +@@ -20433,56 +21028,56 @@ <location filename="../programs/mythshutdown/main.cpp" line="72"/> <source>Error: Database not open while trying to load setting: %1</source> <comment>mythshutdown</comment> @@ -19559,7 +19648,7 @@ <source>Grabbing EPG data in progress...</source> <comment>mythshutdown</comment> - <translation>Grabbing EPG data in progress...</translation> -+ <translation>Grabbing Epg Data in Progress...</translation> ++ <translation>Grabbing EPG Data in Progress...</translation> </message> <message> <location filename="../programs/mythshutdown/main.cpp" line="270"/> @@ -19573,7 +19662,7 @@ <source>Shutdown is locked</source> <comment>mythshutdown</comment> - <translation>Shutdown is locked</translation> -+ <translation>Shutdown Is Locked</translation> ++ <translation>Shutdown is Locked</translation> </message> <message> <location filename="../programs/mythshutdown/main.cpp" line="284"/> @@ -19584,7 +19673,7 @@ </message> <message> <location filename="../programs/mythshutdown/main.cpp" line="317"/> -@@ -20500,176 +21066,176 @@ +@@ -20500,176 +21095,176 @@ <location filename="../programs/mythshutdown/main.cpp" line="342"/> <source>About to start daily wakeup period (1)</source> <comment>mythshutdown</comment> @@ -19603,7 +19692,7 @@ <source>Setup is running...</source> <comment>mythshutdown</comment> - <translation>Setup is running...</translation> -+ <translation>Setup Is Running...</translation> ++ <translation>Setup is Running...</translation> </message> <message> <location filename="../programs/mythshutdown/main.cpp" line="368"/> @@ -19660,7 +19749,7 @@ <source>Next daily wakeup is tomorrow at %1</source> <comment>mythshutdown</comment> - <translation>Next daily wakeup is tomorrow at %1</translation> -+ <translation>Next Daily Wakeup Is Tomorrow At %1</translation> ++ <translation>Next Daily Wakeup is Tomorrow At %1</translation> </message> <message> <location filename="../programs/mythshutdown/main.cpp" line="547"/> @@ -19674,7 +19763,7 @@ <source>Error: no recording time is set</source> <comment>mythshutdown</comment> - <translation>Error: no recording time is set</translation> -+ <translation>Error: No Recording Time Is Set</translation> ++ <translation>Error: No Recording Time is Set</translation> </message> <message> <location filename="../programs/mythshutdown/main.cpp" line="566"/> @@ -19716,14 +19805,14 @@ <source>Program is scheduled but will wake up at next daily wakeup</source> <comment>mythshutdown</comment> - <translation>Program is scheduled but will wake up at next daily wakeup</translation> -+ <translation>Program Is Scheduled but Will Wake Up At Next Daily Wakeup</translation> ++ <translation>Program is Scheduled but Will Wake Up At Next Daily Wakeup</translation> </message> <message> <location filename="../programs/mythshutdown/main.cpp" line="637"/> <source>Daily wakeup is set but will wake up at next scheduled program</source> <comment>mythshutdown</comment> - <translation>Daily wakeup is set but will wake up at next scheduled program</translation> -+ <translation>Daily Wakeup Is Set but Will Wake Up At Next Scheduled Program</translation> ++ <translation>Daily Wakeup is Set but Will Wake Up At Next Scheduled Program</translation> </message> <message> <location filename="../programs/mythshutdown/main.cpp" line="682"/> @@ -19751,7 +19840,7 @@ <source>The next wakeup time is less than 15 mins away, not shutting down.</source> <comment>mythshutdown</comment> - <translation>The next wakeup time is less than 15 mins away, not shutting down.</translation> -+ <translation>The Next Wakeup Time Is Less Than 15 Mins Away, Not Shutting Down.</translation> ++ <translation>The Next Wakeup Time is Less Than 15 Mins Away, Not Shutting Down.</translation> </message> <message> <location filename="../programs/mythshutdown/main.cpp" line="724"/> @@ -19772,7 +19861,7 @@ <source>Everything looks fine, but reboot is needed</source> <comment>mythshutdown</comment> - <translation>Everything looks fine, but reboot is needed</translation> -+ <translation>Everything Looks Fine, but Reboot Is Needed</translation> ++ <translation>Everything Looks Fine, but Reboot is Needed</translation> </message> <message> <location filename="../programs/mythshutdown/main.cpp" line="742"/> @@ -19790,9 +19879,12 @@ </message> <message> <location filename="../programs/mythshutdown/main.cpp" line="760"/> -@@ -20688,12 +21254,12 @@ +@@ -20686,14 +21281,14 @@ + must be yyyy-MM-ddThh:mm:ss</translation> + </message> <message> - <location filename="../libs/libmythtv/recorders/ExternalSignalMonitor.cpp" line="97"/> +- <location filename="../libs/libmythtv/recorders/ExternalSignalMonitor.cpp" line="97"/> ++ <location filename="../libs/libmythtv/recorders/ExternalSignalMonitor.cpp" line="110"/> <source>Error: stream handler died</source> - <translation>Error: stream handler died</translation> + <translation>Error: Stream Handler Died</translation> @@ -19805,7 +19897,7 @@ </message> <message> <location filename="../programs/mythbackend/upnpcdsmusic.cpp" line="105"/> -@@ -20717,6 +21283,11 @@ +@@ -20717,6 +21312,11 @@ <source>Genre</source> <translation>Genre</translation> </message> @@ -19817,7 +19909,7 @@ </context> <context> <name>RawSettingsEditor</name> -@@ -20729,12 +21300,12 @@ +@@ -20729,12 +21329,12 @@ <context> <name>RecMetadataEdit</name> <message> @@ -19833,7 +19925,7 @@ <source>No match found for this recording. You can try entering a TVDB/TMDB number, season, and episode manually.</source> <translation>No match found for this recording. You can try entering a TVDB/TMDB number, season, and episode manually.</translation> </message> -@@ -20742,14 +21313,18 @@ +@@ -20742,14 +21342,18 @@ <context> <name>RecordingProfileEditor</name> <message> @@ -19856,7 +19948,7 @@ </message> </context> <context> -@@ -20822,128 +21397,130 @@ +@@ -20822,128 +21426,130 @@ <message> <location filename="../libs/libmythtv/channelscan/scanmonitor.cpp" line="117"/> <source>Scanning</source> @@ -20034,7 +20126,7 @@ </message> </context> <context> -@@ -20951,168 +21528,173 @@ +@@ -20951,168 +21557,173 @@ <message> <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="52"/> <source>New episode</source> @@ -20115,7 +20207,7 @@ + <location filename="../programs/mythfrontend/schedulecommon.cpp" line="296"/> <source>The following programs will be recorded instead:</source> - <translation>The following programs will be recorded instead:</translation> -+ <translation>Tthe Following Programs Will Be Recorded Instead:</translation> ++ <translation>The Following Programs Will Be Recorded Instead:</translation> + </message> + <message> + <location filename="../programs/mythfrontend/schedulecommon.cpp" line="335"/> @@ -20272,7 +20364,7 @@ </message> </context> <context> -@@ -21147,75 +21729,75 @@ +@@ -21147,75 +21758,75 @@ </message> <message> <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="576"/> @@ -20362,7 +20454,7 @@ <source>Default</source> <translation>Default</translation> </message> -@@ -21251,7 +21833,7 @@ +@@ -21251,7 +21862,7 @@ <message> <location filename="../libs/libmyth/schemawizard.cpp" line="249"/> <source>Error: This version of Myth%1 requires MySQL %2.%3.%4 or later. You seem to be running MySQL version %5.</source> @@ -20371,7 +20463,7 @@ </message> <message> <location filename="../libs/libmyth/schemawizard.cpp" line="317"/> -@@ -21316,7 +21898,7 @@ +@@ -21316,7 +21927,7 @@ <message> <location filename="../libs/libmyth/schemawizard.cpp" line="402"/> <source>This cannot be un-done, so having a database backup would be a good idea.</source> @@ -20380,7 +20472,7 @@ </message> </context> <context> -@@ -21324,68 +21906,116 @@ +@@ -21324,68 +21935,116 @@ <message> <location filename="../libs/libmythtv/signalmonitorvalue.cpp" line="24"/> <source>Could not open tuner device</source> @@ -20448,7 +20540,7 @@ + <message> + <location filename="../programs/mythfrontend/galleryconfig.cpp" line="103"/> + <source>The delay before showing the Loading/Playing status, in milliseconds.</source> -+ <translation>The delay before showing the Loading/Playing status, in milliseconds.</translation> ++ <translation>The delay before showing the loading/playing status, in milliseconds.</translation> + </message> + <message> + <location filename="../programs/mythfrontend/galleryconfig.cpp" line="108"/> @@ -20511,7 +20603,7 @@ </message> <message> <location filename="../programs/mythtv-setup/startprompt.cpp" line="73"/> -@@ -21395,7 +22025,7 @@ +@@ -21395,7 +22054,7 @@ <message> <location filename="../programs/mythtv-setup/startprompt.cpp" line="77"/> <source>Recording Status: RECORDING.</source> @@ -20520,7 +20612,7 @@ </message> <message> <location filename="../programs/mythtv-setup/startprompt.cpp" line="78"/> -@@ -21405,7 +22035,7 @@ +@@ -21405,7 +22064,7 @@ <message> <location filename="../programs/mythtv-setup/startprompt.cpp" line="82"/> <source>Recording Status: None.</source> @@ -20529,12 +20621,12 @@ </message> <message> <location filename="../programs/mythtv-setup/startprompt.cpp" line="103"/> -@@ -21426,15 +22056,15 @@ +@@ -21426,15 +22085,15 @@ <context> <name>StartingChannel</name> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="3318"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="3247"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="3257"/> <source>Please add channels to this source</source> - <translation>Please add channels to this source</translation> + <translation>Please Add Channels to This Source</translation> @@ -20548,7 +20640,7 @@ <source>%n (is) LiveTV and consume(s) %1 </source> <translation> -@@ -21445,7 +22075,7 @@ +@@ -21445,7 +22104,7 @@ </translation> </message> <message numerus="yes"> @@ -20557,7 +20649,7 @@ <source>%n (is) Deleted and consume(s) %1 </source> <translation> -@@ -21457,7 +22087,7 @@ +@@ -21457,7 +22116,7 @@ </message> <message numerus="yes"> <location filename="../programs/mythfrontend/statusbox.cpp" line="592"/> @@ -20566,7 +20658,7 @@ <source>%n day(s)</source> <translation> <numerusform>%n day</numerusform> -@@ -21568,7 +22198,7 @@ +@@ -21568,7 +22227,7 @@ <message> <location filename="../programs/mythfrontend/statusbox.cpp" line="370"/> <source>Move to Default group</source> @@ -20575,7 +20667,7 @@ </message> <message> <location filename="../programs/mythfrontend/statusbox.cpp" line="374"/> -@@ -21588,7 +22218,7 @@ +@@ -21588,7 +22247,7 @@ <message> <location filename="../programs/mythfrontend/statusbox.cpp" line="546"/> <source>Mythfrontend version: %1 (%2)</source> @@ -20584,7 +20676,7 @@ </message> <message> <location filename="../programs/mythfrontend/statusbox.cpp" line="548"/> -@@ -21633,7 +22263,7 @@ +@@ -21633,7 +22292,7 @@ <message> <location filename="../programs/mythfrontend/statusbox.cpp" line="597"/> <source>WARNING: is mythfilldatabase running?</source> @@ -20593,7 +20685,7 @@ </message> <message> <location filename="../programs/mythfrontend/statusbox.cpp" line="602"/> -@@ -21678,47 +22308,47 @@ +@@ -21678,47 +22337,47 @@ </translation> </message> <message> @@ -20650,7 +20742,7 @@ <source>On %1 from %2.%3 %4 </source> -@@ -21726,27 +22356,27 @@ +@@ -21726,27 +22385,27 @@ %4</translation> </message> <message> @@ -20683,7 +20775,7 @@ <source>%n hour(s)</source> <translation> <numerusform>%n hour</numerusform> -@@ -21754,7 +22384,7 @@ +@@ -21754,7 +22413,7 @@ </translation> </message> <message numerus="yes"> @@ -20692,7 +20784,7 @@ <source>%n minute(s)</source> <translation> <numerusform>%n minute</numerusform> -@@ -21762,178 +22392,178 @@ +@@ -21762,178 +22421,178 @@ </translation> </message> <message> @@ -20911,7 +21003,7 @@ <source>%n recording(s) consuming %1 (is) allowed to expire </source> <translation> -@@ -21945,58 +22575,81 @@ +@@ -21945,58 +22604,81 @@ </message> </context> <context> @@ -21010,7 +21102,7 @@ <source>(Add New Directory)</source> <translation>(Add New Directory)</translation> </message> -@@ -22004,168 +22657,170 @@ +@@ -22004,168 +22686,170 @@ <context> <name>StorageGroupListEditor</name> <message> @@ -21211,9 +21303,9 @@ - <location filename="../libs/libmythtv/tv_play.cpp" line="13088"/> - <location filename="../libs/libmythtv/tv_play.cpp" line="13116"/> + <location filename="../libs/libmythtv/tv_play.cpp" line="6779"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12076"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="13019"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="13047"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12080"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="13023"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="13051"/> <source>Jump Back</source> <translation>Jump Back</translation> </message> @@ -21237,7 +21329,7 @@ <source>Sorry, PBP only supports %n video stream(s)</source> <translation> <numerusform>Sorry, PBP only supports %n video stream</numerusform> -@@ -22173,7 +22828,7 @@ +@@ -22173,7 +22857,7 @@ </translation> </message> <message numerus="yes"> @@ -21246,7 +21338,7 @@ <source>Sorry, PIP only supports %n video stream(s)</source> <translation> <numerusform>Sorry, PIP only supports %n video stream</numerusform> -@@ -22181,266 +22836,266 @@ +@@ -22181,266 +22865,266 @@ </translation> </message> <message> @@ -21277,9 +21369,9 @@ - <location filename="../libs/libmythtv/tv_play.cpp" line="13076"/> - <location filename="../libs/libmythtv/tv_play.cpp" line="13161"/> + <location filename="../libs/libmythtv/tv_play.cpp" line="6776"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12071"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="13007"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="13092"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12075"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="13011"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="13096"/> <source>Jump Ahead</source> <translation>Jump Ahead</translation> </message> @@ -21323,7 +21415,7 @@ - <location filename="../libs/libmythtv/tv_play.cpp" line="5078"/> - <location filename="../libs/libmythtv/tv_play.cpp" line="13427"/> + <location filename="../libs/libmythtv/tv_play.cpp" line="5092"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="13358"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="13362"/> <source>Are you sure you want to delete:</source> <translation>Are you sure you want to delete:</translation> </message> @@ -21563,8 +21655,8 @@ - <location filename="../libs/libmythtv/tv_play.cpp" line="12964"/> - <location filename="../libs/libmythtv/tv_play.cpp" line="13342"/> + <location filename="../libs/libmythtv/tv_play.cpp" line="8402"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12895"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="13273"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12899"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="13277"/> <source>OK</source> <translation>OK</translation> </message> @@ -21582,7 +21674,7 @@ <location filename="../libs/libmythtv/tvbrowsehelper.cpp" line="26"/> <location filename="../libs/libmythtv/tvbrowsehelper.cpp" line="310"/> <source>%n minute(s)</source> -@@ -22450,425 +23105,425 @@ +@@ -22450,425 +23134,425 @@ </translation> </message> <message> @@ -21717,7 +21809,7 @@ - <location filename="../libs/libmythtv/tv_play.cpp" line="9031"/> - <location filename="../libs/libmythtv/tv_play.cpp" line="12515"/> + <location filename="../libs/libmythtv/tv_play.cpp" line="8958"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12446"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12450"/> <source>Adjust Time Stretch</source> <translation>Adjust Time Stretch</translation> </message> @@ -21737,7 +21829,7 @@ - <location filename="../libs/libmythtv/tv_play.cpp" line="9125"/> - <location filename="../libs/libmythtv/tv_play.cpp" line="12035"/> + <location filename="../libs/libmythtv/tv_play.cpp" line="9052"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="11966"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="11970"/> <source>Adjust Subtitle Delay</source> <translation>Adjust Subtitle Delay</translation> </message> @@ -21757,7 +21849,7 @@ - <location filename="../libs/libmythtv/tv_play.cpp" line="9154"/> - <location filename="../libs/libmythtv/tv_play.cpp" line="11931"/> + <location filename="../libs/libmythtv/tv_play.cpp" line="9081"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="11862"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="11866"/> <source>Adjust Audio Sync</source> <translation>Adjust Audio Sync</translation> </message> @@ -21870,7 +21962,7 @@ - <location filename="../libs/libmythtv/tv_play.cpp" line="12533"/> + <location filename="../libs/libmythtv/tv_play.cpp" line="10220"/> + <location filename="../libs/libmythtv/tv_play.cpp" line="10235"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12464"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12468"/> <source>Edit Cut Points</source> <translation>Edit Cut Points</translation> </message> @@ -22081,137 +22173,137 @@ </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="11981"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="11912"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="11916"/> <source>Disable Subtitles</source> <translation>Disable Subtitles</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="11987"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="11918"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="11922"/> <source>Enable Subtitles</source> <translation>Enable Subtitles</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="11995"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="11926"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="11930"/> <source>Disable Forced Subtitles</source> <translation>Disable Forced Subtitles</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12004"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="11935"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="11939"/> <source>Enable Forced Subtitles</source> <translation>Enable Forced Subtitles</translation> </message> <message numerus="yes"> - <location filename="../libs/libmythtv/tv_play.cpp" line="12093"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12024"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12028"/> <source>Close PIP(s)</source> <translation> <numerusform>Close PIP</numerusform> -@@ -22876,7 +23531,7 @@ +@@ -22876,7 +23560,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../libs/libmythtv/tv_play.cpp" line="12103"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12034"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12038"/> <source>Close PBP(s)</source> <translation> <numerusform>Close PBP</numerusform> -@@ -22884,701 +23539,701 @@ +@@ -22884,701 +23568,701 @@ </translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12135"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12066"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12070"/> <source>Playback Data</source> <translation>Playback Data</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12152"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12083"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12087"/> <source>DVD Root Menu</source> <translation>DVD Root Menu</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12163"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12094"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12098"/> <source>DVD Title Menu</source> <translation>DVD Title Menu</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12168"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12099"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12103"/> <source>DVD Chapter Menu</source> <translation>DVD Chapter Menu</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12496"/> - <location filename="../libs/libmythtv/tv_play.cpp" line="12547"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12427"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12478"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12431"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12482"/> <source>Playback Compact Menu</source> <translation>Playback Compact Menu</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12524"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12455"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12459"/> <source>Schedule</source> <translation>Schedule</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12177"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12108"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12112"/> <source>Program Guide</source> <translation>Program Guide</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12217"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12148"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12152"/> <source>Edit Channel</source> <translation>Edit Channel</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12217"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12148"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12152"/> <source>Edit Recording</source> <translation>Edit Recording</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12526"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12457"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12461"/> <source>Jump to Program</source> <translation>Jump to Program</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12193"/> - <location filename="../libs/libmythtv/tv_play.cpp" line="12574"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12124"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12505"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12128"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12509"/> <source>Recorded Program</source> <translation>Recorded Program</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12173"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12104"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12108"/> <source>Previous Channel</source> <translation>Previous Channel</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12022"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="11953"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="11957"/> <source>Toggle Teletext Menu</source> <translation>Toggle Teletext Menu</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="11966"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="11897"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="11901"/> <source>Manual Zoom Mode</source> <translation>Manual Zoom Mode</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12518"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12449"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12453"/> <source>Channel Groups</source> <translation>Channel Groups</translation> </message> @@ -22223,13 +22315,13 @@ </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12234"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12165"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12169"/> <source>Stop Transcoding</source> <translation>Stop Transcoding</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12530"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12461"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12465"/> <source>Begin Transcoding</source> <translation>Begin Transcoding</translation> </message> @@ -22258,82 +22350,82 @@ - <location filename="../libs/libmythtv/tv_play.cpp" line="10334"/> - <location filename="../libs/libmythtv/tv_play.cpp" line="12485"/> + <location filename="../libs/libmythtv/tv_play.cpp" line="10265"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12416"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12420"/> <source>Edit</source> <translation>Edit</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12234"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12165"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12169"/> <source>Default</source> <translation>Default</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12242"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12173"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12177"/> <source>Autodetect</source> <translation>Autodetect</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12250"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12181"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12185"/> <source>High Quality</source> <translation>High Quality</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12258"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12189"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12193"/> <source>Medium Quality</source> <translation>Medium Quality</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12266"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12197"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12201"/> <source>Low Quality</source> <translation>Low Quality</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12520"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12451"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12455"/> <source>Commercial Auto-Skip</source> - <translation>Commercial Auto-Skip</translation> + <translation>Commercial Auto-skip</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12226"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12157"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12161"/> <source>Turn Auto-Expire OFF</source> - <translation>Turn Auto-Expire OFF</translation> + <translation>Turn Auto-expire Off</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12226"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12157"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12161"/> <source>Turn Auto-Expire ON</source> - <translation>Turn Auto-Expire ON</translation> + <translation>Turn Auto-expire On</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12185"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12116"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12120"/> <source>Upcoming Recordings</source> <translation>Upcoming Recordings</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12181"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12112"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12116"/> <source>Program Finder</source> <translation>Program Finder</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12189"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12120"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12124"/> <source>Edit Recording Schedule</source> <translation>Edit Recording Schedule</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12521"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12452"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12456"/> <source>Chapter</source> <translation>Chapter</translation> </message> @@ -22347,14 +22439,14 @@ <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12495"/> - <location filename="../libs/libmythtv/tv_play.cpp" line="12543"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12426"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12474"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12430"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12478"/> <source>Playback Menu</source> <translation>Playback Menu</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12497"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12428"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12432"/> <source>Audio</source> <translation>Audio</translation> </message> @@ -22362,7 +22454,7 @@ - <location filename="../libs/libmythtv/tv_play.cpp" line="8958"/> - <location filename="../libs/libmythtv/tv_play.cpp" line="12500"/> + <location filename="../libs/libmythtv/tv_play.cpp" line="8885"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12431"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12435"/> <source>Video</source> <translation>Video</translation> </message> @@ -22382,7 +22474,7 @@ - <location filename="../libs/libmythtv/tv_play.cpp" line="9087"/> - <location filename="../libs/libmythtv/tv_play.cpp" line="12027"/> + <location filename="../libs/libmythtv/tv_play.cpp" line="9014"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="11958"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="11962"/> <source>Adjust Subtitle Zoom</source> <translation>Adjust Subtitle Zoom</translation> </message> @@ -22394,204 +22486,204 @@ </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12505"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12436"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12440"/> <source>Advanced</source> <translation>Advanced</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12507"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12438"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12442"/> <source>Deinterlacer</source> <translation>Deinterlacer</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12508"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12439"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12443"/> <source>Subtitles</source> <translation>Subtitles</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12510"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12441"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12445"/> <source>Text Subtitles</source> <translation>Text Subtitles</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12513"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12444"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12448"/> <source>Select Teletext CC</source> <translation>Select Teletext CC</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12519"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12450"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12454"/> <source>Navigate</source> <translation>Navigate</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12152"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12083"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12087"/> <source>Top menu</source> - <translation>Top menu</translation> + <translation>Top Menu</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12158"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12089"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12093"/> <source>Popup menu</source> - <translation>Popup menu</translation> + <translation>Popup Menu</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12522"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12453"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12457"/> <source>Angle</source> <translation>Angle</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12523"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12454"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12458"/> <source>Title</source> <translation>Title</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12525"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12456"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12460"/> <source>Source</source> <translation>Source</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12529"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12460"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12464"/> <source>Jobs</source> <translation>Jobs</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12514"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12445"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12449"/> <source>Playback</source> <translation>Playback</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12041"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="11972"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="11976"/> <source>Play</source> <translation>Play</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12041"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="11972"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="11976"/> <source>Pause</source> <translation>Pause</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12516"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12447"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12451"/> <source>Picture-in-Picture</source> <translation>Picture-in-Picture</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12126"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12057"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12061"/> <source>Toggle Browse Mode</source> <translation>Toggle Browse Mode</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12131"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12062"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12066"/> <source>Cancel Playlist</source> <translation>Cancel Playlist</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12053"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="11984"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="11988"/> <source>Open Live TV PIP</source> <translation>Open Live TV PIP</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12062"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="11993"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="11997"/> <source>Open Live TV PBP</source> <translation>Open Live TV PBP</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12070"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12001"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12005"/> <source>Open Recording PIP</source> <translation>Open Recording PIP</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12078"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12009"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12013"/> <source>Open Recording PBP</source> <translation>Open Recording PBP</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12084"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12015"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12019"/> <source>Change Active Window</source> <translation>Change Active Window</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12110"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12041"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12045"/> <source>Swap Windows</source> <translation>Swap Windows</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12120"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12051"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12055"/> <source>Switch to PIP</source> <translation>Switch to PIP</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12120"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12051"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12055"/> <source>Switch to PBP</source> <translation>Switch to PBP</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="13386"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="13317"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="13321"/> <source>No, keep it</source> - <translation>No, keep it</translation> + <translation>No, Keep</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12527"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12458"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12462"/> <source>Switch Input</source> <translation>Switch Input</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12528"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12459"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12463"/> <source>Switch Source</source> <translation>Switch Source</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12501"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12432"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12436"/> <source>Change Aspect Ratio</source> <translation>Change Aspect Ratio</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12502"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12433"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12437"/> <source>Adjust Fill</source> <translation>Adjust Fill</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="11951"/> - <location filename="../libs/libmythtv/tv_play.cpp" line="11961"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="11882"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="11892"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="11886"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="11896"/> <source>Auto Detect</source> <translation>Auto Detect</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12503"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12434"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12438"/> <source>Adjust Picture</source> <translation>Adjust Picture</translation> </message> @@ -22603,14 +22695,14 @@ </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12499"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12430"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12434"/> <source>Visualisation</source> <translatorcomment>Original string is in British English</translatorcomment> <translation>Visualization</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="11943"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="11874"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="11878"/> <source>Disable Audio Upmixer</source> <translation>Disable Audio Upmixer</translation> </message> @@ -22618,25 +22710,25 @@ - <location filename="../libs/libmythtv/tv_play.cpp" line="11696"/> - <location filename="../libs/libmythtv/tv_play.cpp" line="11936"/> + <location filename="../libs/libmythtv/tv_play.cpp" line="11627"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="11867"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="11871"/> <source>None</source> <translation>None</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12504"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12435"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12439"/> <source>3D</source> <translation>3D</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="11974"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="11905"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="11909"/> <source>Disable Night Mode</source> <translation>Disable Night Mode</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="11974"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="11905"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="11909"/> <source>Enable Night Mode</source> <translation>Enable Night Mode</translation> </message> @@ -22666,19 +22758,19 @@ </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12011"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="11942"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="11946"/> <source>Disable External Subtitles</source> <translation>Disable External Subtitles</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12017"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="11948"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="11952"/> <source>Enable External Subtitles</source> <translation>Enable External Subtitles</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12045"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="11976"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="11980"/> <source>Toggle</source> <translation>Toggle</translation> </message> @@ -22690,35 +22782,35 @@ </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12429"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12360"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12364"/> <source>(I)</source> <comment>Interlaced (Normal)</comment> <translation>(I)</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12431"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12362"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12366"/> <source>(i)</source> <comment>Interlaced (Reversed)</comment> <translation>(i)</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12433"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12364"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12368"/> <source>(P)</source> <comment>Progressive</comment> <translation>(P)</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12942"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12873"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12877"/> <source>MythTV is already using all available inputs for the channel you selected. If you want to watch an in-progress recording, select one from the playback menu. If you want to watch Live TV, cancel one of the in-progress recordings from the delete menu.</source> - <translation>MythTV is already using all available inputs for the channel you selected. If you want to watch an in-progress recording, select one from the playback menu. If you want to watch Live TV, cancel one of the in-progress recordings from the delete menu.</translation> + <translation>MythTV is already using all available inputs for the channel you selected. If you want to watch an in-progress recording, select one from the playback menu. If you want to watch Live TV, cancel one of the in-progress recordings from the delete menu.</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12506"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12437"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12441"/> <source>Video Scan</source> <translation>Video Scan</translation> </message> @@ -22750,9 +22842,9 @@ - <location filename="../libs/libmythtv/tv_play.cpp" line="12517"/> - <location filename="../libs/libmythtv/tv_play.cpp" line="12929"/> - <location filename="../libs/libmythtv/tv_play.cpp" line="12931"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12448"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12860"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12862"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12452"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12864"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12866"/> <source>Sleep</source> <translation>Sleep</translation> </message> @@ -22764,204 +22856,205 @@ </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12498"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12429"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12433"/> <source>Select Audio Track</source> <translation>Select Audio Track</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12509"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12440"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12444"/> <source>Select Subtitle</source> <translation>Select Subtitle</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12512"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12443"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12447"/> <source>Select VBI CC</source> <translation>Select VBI CC</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12511"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12442"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12446"/> <source>Select ATSC CC</source> <translation>Select ATSC CC</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12534"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12465"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12469"/> <source>Edit Cut Points (Compact)</source> <translation>Edit Cut Points (Compact)</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12535"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12466"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12470"/> <source>Cut List Options</source> <translation>Cut List Options</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12703"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12634"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12638"/> <source>Auto-Expire OFF</source> - <translation>Auto-Expire OFF</translation> + <translation>Auto-expire Off</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12708"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12639"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12643"/> <source>Auto-Expire ON</source> - <translation>Auto-Expire ON</translation> + <translation>Auto-expire On</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12951"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12882"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12886"/> <source>Error: MythTV is using all inputs, but there are no active recordings?</source> - <translation>Error: MythTV is using all inputs, but there are no active recordings?</translation> + <translation>ERROR: MythTV is using all inputs, but there are no active recordings?</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12955"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="12886"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="12890"/> <source>MythTV has no capture cards defined. Please run the mythtv-setup program.</source> <translation>MythTV has no capture cards defined. Please run the mythtv-setup program.</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="13104"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="13035"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="13039"/> <source>Skip Back Not Allowed</source> <translation>Skip Back Not Allowed</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="13127"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="13058"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="13062"/> <source>Previous Title</source> <translation>Previous Title</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="13146"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="13077"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="13081"/> <source>Skip Still Frame</source> <translation>Skip Still Frame</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="13172"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="13103"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="13107"/> <source>Next Title</source> <translation>Next Title</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="13235"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="13166"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="13170"/> <source>Live TV</source> <translation>Live TV</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="13237"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="13168"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="13172"/> <source>this DVD</source> <translation>this DVD</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="13241"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="13172"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="13176"/> <source>this Video</source> <translation>this Video</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="13245"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="13176"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="13180"/> <source>this recording</source> - <translation>this recording</translation> + <translation>this Recording</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="13251"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="13182"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="13186"/> <source>You are exiting %1</source> - <translation>You are exiting %1</translation> + <translation>You Are Exiting %1</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="13255"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="13186"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="13190"/> <source>Save this position and go to the menu</source> - <translation>Save this position and go to the menu</translation> + <translation>Save and Exit</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="13257"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="13188"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="13192"/> <source>Do not save, just exit to the menu</source> - <translation>Do not save, just exit to the menu</translation> + <translation>Exit Without Saving</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="13261"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="13192"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="13196"/> <source>Exit %1</source> <translation>Exit %1</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="13265"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="13196"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="13200"/> <source>Delete this recording</source> <translation>Delete this recording</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="13268"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="13199"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="13203"/> <source>Keep watching</source> <translation>Keep watching</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="13314"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="13245"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="13249"/> <source>Cannot delete program </source> - <translation>Cannot delete program </translation> +- <translation>Cannot delete program </translation> ++ <translation>Cannot delete program</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="13323"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="13254"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="13258"/> <source>because it is not a recording.</source> <translation>because it is not a recording.</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="13327"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="13258"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="13262"/> <source>because it is in use by</source> <translation>because it is in use by</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="13373"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="13304"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="13308"/> <source>Delete it, but allow it to re-record</source> - <translation>Delete it, but allow it to re-record</translation> + <translation>Delete Recording, and Allow Re-record</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="13375"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="13306"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="13310"/> <source>Delete it</source> - <translation>Delete it</translation> + <translation>Delete Recording</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="13377"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="13308"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="13312"/> <source>Save it so I can watch it again</source> - <translation>Save it so I can watch it again</translation> + <translation>Keep Recording</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="13382"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="13313"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="13317"/> <source>Yes, and allow re-record</source> - <translation>Yes, and allow re-record</translation> + <translation>Yes, Delete and Allow Re-record</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="13384"/> -+ <location filename="../libs/libmythtv/tv_play.cpp" line="13315"/> ++ <location filename="../libs/libmythtv/tv_play.cpp" line="13319"/> <source>Yes, delete it</source> - <translation>Yes, delete it</translation> + <translation>Yes, Delete</translation> @@ -22971,25 +23064,25 @@ <name>TVRec</name> <message> - <location filename="../libs/libmythtv/tv_rec.cpp" line="3934"/> -+ <location filename="../libs/libmythtv/tv_rec.cpp" line="3959"/> ++ <location filename="../libs/libmythtv/tv_rec.cpp" line="3912"/> <source>Good signal seen after %1 ms</source> <translation>Good signal seen after %1 ms</translation> </message> <message> - <location filename="../libs/libmythtv/tv_rec.cpp" line="3943"/> - <location filename="../libs/libmythtv/tv_rec.cpp" line="3995"/> -+ <location filename="../libs/libmythtv/tv_rec.cpp" line="3968"/> -+ <location filename="../libs/libmythtv/tv_rec.cpp" line="4027"/> ++ <location filename="../libs/libmythtv/tv_rec.cpp" line="3921"/> ++ <location filename="../libs/libmythtv/tv_rec.cpp" line="3976"/> <source>See 'Tuning timeout' in mythtv-setup for this input.</source> <translation>See 'Tuning timeout' in mythtv-setup for this input.</translation> </message> <message> - <location filename="../libs/libmythtv/tv_rec.cpp" line="3987"/> -+ <location filename="../libs/libmythtv/tv_rec.cpp" line="4019"/> ++ <location filename="../libs/libmythtv/tv_rec.cpp" line="3968"/> <source>Taking more than %1 ms to get a lock.</source> <translation>Taking more than %1 ms to get a lock.</translation> </message> -@@ -23586,7 +24241,7 @@ +@@ -23586,133 +24270,133 @@ <context> <name>ThemeChooser</name> <message> @@ -22998,8 +23091,11 @@ <source>Theme Chooser Menu</source> <translation>Theme Chooser Menu</translation> </message> -@@ -23596,123 +24251,123 @@ - <translation>Loading Installed Themes</translation> + <message> + <location filename="../programs/mythfrontend/themechooser.cpp" line="152"/> + <source>Loading Installed Themes</source> +- <translation>Loading Installed Themes</translation> ++ <translation>Loading Installed Themes...</translation> </message> <message> - <location filename="../programs/mythfrontend/themechooser.cpp" line="271"/> @@ -23013,7 +23109,8 @@ - <location filename="../programs/mythfrontend/themechooser.cpp" line="275"/> + <location filename="../programs/mythfrontend/themechooser.cpp" line="284"/> <source>Refreshing Downloadable Themes Information</source> - <translation>Refreshing Downloadable Themes Information</translation> +- <translation>Refreshing Downloadable Themes Information</translation> ++ <translation>Refreshing Downloadable Themes Information...</translation> </message> <message> - <location filename="../programs/mythfrontend/themechooser.cpp" line="283"/> @@ -23025,7 +23122,8 @@ - <location filename="../programs/mythfrontend/themechooser.cpp" line="292"/> + <location filename="../programs/mythfrontend/themechooser.cpp" line="301"/> <source>Extracting Downloadable Themes Information</source> - <translation>Extracting Downloadable Themes Information</translation> +- <translation>Extracting Downloadable Themes Information</translation> ++ <translation>Extracting Downloadable Themes Information...</translation> </message> <message> - <location filename="../programs/mythfrontend/themechooser.cpp" line="307"/> @@ -23045,7 +23143,8 @@ - <location filename="../programs/mythfrontend/themechooser.cpp" line="333"/> + <location filename="../programs/mythfrontend/themechooser.cpp" line="342"/> <source>Loading Downloadable Themes</source> - <translation>Loading Downloadable Themes</translation> +- <translation>Loading Downloadable Themes</translation> ++ <translation>Loading Downloadable Themes...</translation> </message> <message> - <location filename="../programs/mythfrontend/themechooser.cpp" line="496"/> @@ -23153,7 +23252,7 @@ <source>%1 is not a user-installed theme and can not be deleted.</source> <translation>%1 is not a user-installed theme and can not be deleted.</translation> </message> -@@ -23976,7 +24631,7 @@ +@@ -23976,7 +24660,7 @@ <message> <location filename="../themes/themestrings.h" line="718"/> <source>To manually schedule a recording, enter a title (optional). Then set the channel, date, start time, and duration of your recording. Note that this recording will not have any listings data or other information provided by an EPG.</source> @@ -23162,7 +23261,7 @@ </message> <message> <location filename="../themes/themestrings.h" line="851"/> -@@ -24130,7 +24785,7 @@ +@@ -24130,7 +24814,7 @@ <message> <location filename="../themes/themestrings.h" line="729"/> <source>Below you will find the program details of the selected item. There are two available screens. You can toggle between them by pressing INFO.</source> @@ -23171,7 +23270,7 @@ </message> <message> <location filename="../themes/themestrings.h" line="866"/> -@@ -24317,7 +24972,7 @@ +@@ -24317,7 +25001,7 @@ <message> <location filename="../themes/themestrings.h" line="890"/> <source>Allow Recordings to Auto-Expire</source> @@ -23180,7 +23279,7 @@ </message> <message> <location filename="../themes/themestrings.h" line="891"/> -@@ -24397,7 +25052,7 @@ +@@ -24397,7 +25081,7 @@ <message> <location filename="../themes/themestrings.h" line="908"/> <source>Type your tweet below. Select "Send" to submit it.</source> @@ -23189,7 +23288,7 @@ </message> <message> <location filename="../themes/themestrings.h" line="909"/> -@@ -24452,7 +25107,7 @@ +@@ -24452,7 +25136,7 @@ <message> <location filename="../themes/themestrings.h" line="390"/> <source>WARNING: There are conflicting scheduled recordings!</source> @@ -23198,7 +23297,7 @@ </message> <message> <location filename="../themes/themestrings.h" line="954"/> -@@ -24604,7 +25259,7 @@ +@@ -24604,7 +25288,7 @@ <message> <location filename="../themes/themestrings.h" line="994"/> <source>Graphite is a theme emphasizing MythUI interface improvements such as alpha, animation, unique layouts, and user-supplied backdrop content. It is extremely memory-hungry.</source> @@ -23207,7 +23306,7 @@ </message> <message> <location filename="../themes/themestrings.h" line="1011"/> -@@ -25307,7 +25962,7 @@ +@@ -25307,7 +25991,7 @@ <message> <location filename="../themes/themestrings.h" line="1080"/> <source>Press Up/Down from letter list, to navigate to another list. Press Left/Right from Show or Episode list to navigate to another list.</source> @@ -23216,7 +23315,7 @@ </message> <message> <location filename="../themes/themestrings.h" line="1083"/> -@@ -25332,7 +25987,7 @@ +@@ -25332,7 +26016,7 @@ <message> <location filename="../themes/themestrings.h" line="1106"/> <source>No videos in library, or no files found. If you have configured a video directory, press MENU and select "Scan for Changes."</source> @@ -23225,7 +23324,7 @@ </message> <message> <location filename="../themes/themestrings.h" line="745"/> -@@ -25376,7 +26031,7 @@ +@@ -25376,7 +26060,7 @@ <message> <location filename="../themes/themestrings.h" line="1122"/> <source>Designed to show off some different element arrangements. Reminder: On Watch Recordings screen [Rew] and [FF] can be used to change the Rec. Group.</source> @@ -23234,7 +23333,7 @@ </message> <message> <location filename="../themes/themestrings.h" line="1123"/> -@@ -25627,7 +26282,7 @@ +@@ -25627,7 +26311,7 @@ <message> <location filename="../themes/themestrings.h" line="1172"/> <source>Protocol-Version: %1</source> @@ -23243,7 +23342,7 @@ </message> <message> <location filename="../themes/themestrings.h" line="1173"/> -@@ -25860,7 +26515,7 @@ +@@ -25860,7 +26544,7 @@ <message> <location filename="../themes/themestrings.h" line="360"/> <source>Move the selected corner of the preview image to the corner of the TV screen. Press SELECT to edit the other corner. Press MENU for options and ESC to quit.</source> @@ -23252,7 +23351,7 @@ </message> <message> <location filename="../themes/themestrings.h" line="417"/> -@@ -26303,7 +26958,7 @@ +@@ -26303,7 +26987,7 @@ <message> <location filename="../themes/themestrings.h" line="638"/> <source>Ok</source> @@ -23261,7 +23360,7 @@ </message> <message> <location filename="../themes/themestrings.h" line="639"/> -@@ -26423,7 +27078,7 @@ +@@ -26423,7 +27107,7 @@ <message> <location filename="../themes/themestrings.h" line="665"/> <source>PCM-BluRay</source> @@ -23270,7 +23369,7 @@ </message> <message> <location filename="../themes/themestrings.h" line="666"/> -@@ -26618,7 +27273,7 @@ +@@ -26618,7 +27302,7 @@ <message> <location filename="../themes/themestrings.h" line="706"/> <source>To create a custom recording rule, either select an existing rule, or create a new rule by typing in a name. Then select a rule type and hit enter. The SQL code will be transferred below, and you can edit it and insert your own program information. Finally, you can test, immediately activate, store, or cancel your rule.</source> @@ -23279,7 +23378,7 @@ </message> <message> <location filename="../themes/themestrings.h" line="708"/> -@@ -26902,7 +27557,7 @@ +@@ -26902,7 +27586,7 @@ <message> <location filename="../themes/themestrings.h" line="802"/> <source>Let'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> @@ -23288,7 +23387,7 @@ </message> <message> <location filename="../themes/themestrings.h" line="803"/> -@@ -27454,7 +28109,7 @@ +@@ -27454,7 +28138,7 @@ <message> <location filename="../themes/themestrings.h" line="1103"/> <source>Designed to show off some different element arrangements. Tested at 1280x720 and with Français. Reminder: On Watch Recordings screen [Rew] and [FF] can be used to change the Rec. Group.</source> @@ -23297,7 +23396,7 @@ </message> <message> <location filename="../themes/themestrings.h" line="1107"/> -@@ -28434,7 +29089,7 @@ +@@ -28434,7 +29118,7 @@ <message> <location filename="../themes/themestrings.h" line="300"/> <source>No videos in library, or no files found. If you have configured a video directory, press "M" (or the MENU key) and select "Scan for Changes."</source> @@ -23306,7 +23405,7 @@ </message> <message> <location filename="../themes/themestrings.h" line="303"/> -@@ -28564,7 +29219,7 @@ +@@ -28564,7 +29248,7 @@ <message> <location filename="../themes/themestrings.h" line="478"/> <source>Post-Processing Options</source> @@ -23315,7 +23414,7 @@ </message> <message> <location filename="../themes/themestrings.h" line="279"/> -@@ -28851,9 +29506,9 @@ +@@ -28851,9 +29535,9 @@ <source>On this screen, you can add new extensions to be recognized by the Video Plugin. If a scan does not add your files, create a new extension below by clicking the "New" button. If you select "Use Default Player," the player command set for the extension will be ignored. "Ignore This File Type" prevents the items from appearing in a scan.</source> @@ -23327,7 +23426,7 @@ </message> <message> <location filename="../themes/themestrings.h" line="922"/> -@@ -29298,7 +29953,7 @@ +@@ -29298,7 +29982,7 @@ <message> <location filename="../themes/themestrings.h" line="953"/> <source>Move the selected arrow to the corner of the TV screen. Press SELECT to edit the other arrow. Press MENU for options and ESC to quit.</source> @@ -23336,7 +23435,7 @@ </message> <message> <location filename="../themes/themestrings.h" line="160"/> -@@ -29674,12 +30329,12 @@ +@@ -29674,12 +30358,12 @@ <message> <location filename="../themes/themestrings.h" line="907"/> <source>Arclight is a sleek theme meant for widescreen HD displays. It is high contrast and uses shapes and an attractive layout to convey information simply and consistently.</source> @@ -23351,7 +23450,7 @@ </message> <message> <location filename="../themes/themestrings.h" line="20"/> -@@ -29699,12 +30354,12 @@ +@@ -29699,12 +30383,12 @@ <message> <location filename="../themes/themestrings.h" line="293"/> <source>A blue theme. Originally designed before the MythUI rewrite, MythCenter has been updated to take advantage of the new UI library while still maintaining the look and feel that long-time MythTV users are used to.</source> @@ -23366,7 +23465,7 @@ </message> <message> <location filename="../themes/themestrings.h" line="394"/> -@@ -29954,7 +30609,7 @@ +@@ -29954,7 +30638,7 @@ <context> <name>ThemeUpdateChecker</name> <message> @@ -23375,7 +23474,7 @@ <source>Version %1 of the %2 theme is now available in the Theme Chooser. The currently installed version is %3.</source> <translation>Version %1 of the %2 theme is now available in the Theme Chooser. The currently installed version is %3.</translation> </message> -@@ -29991,12 +30646,12 @@ +@@ -29991,12 +30675,12 @@ <message> <location filename="../programs/mythfrontend/galleryconfig.cpp" line="22"/> <source>Exif Date (oldest first)</source> @@ -23390,7 +23489,7 @@ </message> <message> <location filename="../programs/mythfrontend/galleryconfig.cpp" line="24"/> -@@ -30046,7 +30701,7 @@ +@@ -30046,12 +30730,23 @@ <translation>Date Format</translation> </message> <message> @@ -23399,7 +23498,23 @@ <source>Date format of thumbnail captions. Other places use the system date format. Sample shows 3rd May 2002.</source> <translation>Date format of thumbnail captions. Other places use the system date format. Sample shows 3rd May 2002.</translation> </message> -@@ -30087,45 +30742,46 @@ + </context> + <context> ++ <name>Transcode</name> ++ <message> ++ <source>Autodetect from %1</source> ++ <translation type="obsolete">Autodetect from %1</translation> ++ </message> ++ <message> ++ <source>Completed</source> ++ <translation type="obsolete">Completed</translation> ++ </message> ++</context> ++<context> + <name>Transition</name> + <message> + <location filename="../programs/mythfrontend/gallerytransitions.h" line="103"/> +@@ -30087,45 +30782,46 @@ <context> <name>TransportList</name> <message> @@ -23458,7 +23573,7 @@ <source>Delete...</source> <translation>Delete...</translation> </message> -@@ -30133,8 +30789,8 @@ +@@ -30133,8 +30829,8 @@ <context> <name>UPNPScanner</name> <message> @@ -23469,26 +23584,26 @@ <source>Media Servers</source> <translation>Media Servers</translation> </message> -@@ -30230,89 +30886,89 @@ +@@ -30230,89 +30926,89 @@ <context> <name>V4L2encGroup</name> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="2705"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="2650"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2660"/> <source>Probed info</source> - <translation>Probed info</translation> + <translation>Probed Info</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="2729"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="2664"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2674"/> <source>Failed to open</source> - <translation>Failed to open</translation> + <translation>Failed to Open</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="2735"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="2670"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2680"/> <source>Failed to probe</source> - <translation>Failed to probe</translation> + <translation>Failed to Probe</translation> @@ -23498,21 +23613,21 @@ <name>V4LConfigurationGroup</name> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="2470"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="2417"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2420"/> <source>Probed info</source> - <translation>Probed info</translation> + <translation>Probed Info</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="2485"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="2435"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2438"/> <source>Failed to open</source> - <translation>Failed to open</translation> + <translation>Failed to Open</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="2492"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="2442"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2445"/> <source>Failed to probe</source> - <translation>Failed to probe</translation> + <translation>Failed to Probe</translation> @@ -23581,12 +23696,12 @@ <source>Done</source> <translation>Done</translation> </message> -@@ -30320,35 +30976,34 @@ +@@ -30320,35 +31016,34 @@ <context> <name>VBoxConfigurationGroup</name> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="2267"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="2237"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2240"/> <source>Description</source> <translation>Description</translation> </message> @@ -23601,13 +23716,13 @@ <name>VBoxDeviceID</name> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="1663"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="1693"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="1696"/> <source>Device ID</source> <translation>Device ID</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="1664"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="1694"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="1697"/> <source>Device ID of VBox device</source> - <translation>Device ID of VBox device</translation> + <translation>Device ID of VBox Device</translation> @@ -23619,13 +23734,13 @@ - <location filename="../libs/libmythtv/videosource.cpp" line="1735"/> - <location filename="../libs/libmythtv/videosource.cpp" line="1779"/> - <location filename="../libs/libmythtv/videosource.cpp" line="1786"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="1768"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="1814"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="1821"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="1771"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="1817"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="1824"/> <source>Manually Enter IP Address</source> <translation>Manually Enter IP Address</translation> </message> -@@ -30449,7 +31104,7 @@ +@@ -30449,7 +31144,7 @@ <message> <location filename="../programs/mythfrontend/videodlg.cpp" line="2503"/> <source>Play With Trailers</source> @@ -23634,7 +23749,7 @@ </message> <message> <location filename="../programs/mythfrontend/videodlg.cpp" line="2510"/> -@@ -30464,7 +31119,7 @@ +@@ -30464,7 +31159,7 @@ <message> <location filename="../programs/mythfrontend/videodlg.cpp" line="2526"/> <source>Scan For Changes</source> @@ -23643,7 +23758,7 @@ </message> <message> <location filename="../programs/mythfrontend/videodlg.cpp" line="2527"/> -@@ -30490,12 +31145,12 @@ +@@ -30490,12 +31185,12 @@ <message> <location filename="../programs/mythfrontend/videodlg.cpp" line="3374"/> <source>Failed to retrieve image(s)</source> @@ -23658,7 +23773,7 @@ </message> <message> <location filename="../programs/mythfrontend/videodlg.cpp" line="3836"/> -@@ -30521,12 +31176,12 @@ +@@ -30521,12 +31216,12 @@ <message> <location filename="../programs/mythfrontend/videodlg.cpp" line="2177"/> <source>Retrieved details for %1</source> @@ -23673,7 +23788,7 @@ </message> <message> <location filename="../programs/mythfrontend/videodlg.cpp" line="2552"/> -@@ -30706,7 +31361,7 @@ +@@ -30706,7 +31401,7 @@ <message> <location filename="../programs/mythfrontend/videodlg.cpp" line="2152"/> <source>Fetching details for %1</source> @@ -23682,7 +23797,7 @@ </message> <message> <location filename="../programs/mythfrontend/videodlg.cpp" line="3557"/> -@@ -30718,7 +31373,7 @@ +@@ -30718,7 +31413,7 @@ <message> <location filename="../programs/mythfrontend/videodlg.cpp" line="3595"/> <source>Failed to delete file</source> @@ -23691,7 +23806,7 @@ </message> </context> <context> -@@ -30901,7 +31556,7 @@ +@@ -30901,7 +31596,7 @@ <message> <location filename="../programs/mythfrontend/videoglobalsettings.cpp" line="106"/> <source>Directories that hold videos</source> @@ -23700,7 +23815,7 @@ </message> <message> <location filename="../programs/mythfrontend/videoglobalsettings.cpp" line="110"/> -@@ -30911,7 +31566,7 @@ +@@ -30911,7 +31606,7 @@ <message> <location filename="../programs/mythfrontend/videoglobalsettings.cpp" line="122"/> <source>Directory that holds movie posters</source> @@ -23709,7 +23824,7 @@ </message> <message> <location filename="../programs/mythfrontend/videoglobalsettings.cpp" line="127"/> -@@ -30925,37 +31580,37 @@ +@@ -30925,37 +31620,37 @@ <message> <location filename="../programs/mythfrontend/videoglobalsettings.cpp" line="138"/> <source>Directory that holds movie screenshots</source> @@ -23754,7 +23869,7 @@ </message> <message> <location filename="../programs/mythfrontend/videoglobalsettings.cpp" line="211"/> -@@ -30970,7 +31625,7 @@ +@@ -30970,7 +31665,7 @@ <message> <location filename="../programs/mythfrontend/videoglobalsettings.cpp" line="224"/> <source>Video Tree remembers last selected position</source> @@ -23763,7 +23878,7 @@ </message> <message> <location filename="../programs/mythfrontend/videoglobalsettings.cpp" line="229"/> -@@ -30978,58 +31633,62 @@ +@@ -30978,58 +31673,62 @@ <translation>If set, the current position in the Video Tree is persistent.</translation> </message> <message> @@ -23838,7 +23953,7 @@ </message> </context> <context> -@@ -31057,118 +31716,117 @@ +@@ -31057,118 +31756,117 @@ <context> <name>VideoModeSettings</name> <message> @@ -23983,28 +24098,28 @@ <source>Zoom %1x%2 @ (%3,%4)</source> <translation>Zoom %1x%2 @ (%3,%4)</translation> </message> -@@ -31194,17 +31852,17 @@ +@@ -31194,17 +31892,17 @@ <message> <location filename="../libs/libmythmetadata/videoscan.cpp" line="181"/> <source>Searching for video files</source> - <translation>Searching for video files</translation> -+ <translation>Searching for Video Files</translation> ++ <translation>Searching for Video Files...</translation> </message> <message> <location filename="../libs/libmythmetadata/videoscan.cpp" line="258"/> <source>Verifying video files</source> - <translation>Verifying video files</translation> -+ <translation>Verifying Video Files</translation> ++ <translation>Verifying Video Files...</translation> </message> <message> <location filename="../libs/libmythmetadata/videoscan.cpp" line="314"/> <source>Updating video database</source> - <translation>Updating video database</translation> -+ <translation>Updating Video Database</translation> ++ <translation>Updating Video Database...</translation> </message> </context> <context> -@@ -31212,17 +31870,17 @@ +@@ -31212,17 +31910,17 @@ <message> <location filename="../programs/mythfrontend/setupwizard_video.cpp" line="70"/> <source>Select from one of the preconfigured playback profiles. When satisfied, you can test Standard Definition and High Definition playback with the selected profile before moving on.</source> @@ -24025,18 +24140,18 @@ </message> <message> <location filename="../programs/mythfrontend/setupwizard_video.cpp" line="79"/> -@@ -31275,56 +31933,53 @@ +@@ -31275,56 +31973,53 @@ <context> <name>VideoSourceEditor</name> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="3887"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="3807"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="3817"/> <source>Video sources</source> - <translation>Video sources</translation> + <translation>Video Sources</translation> + </message> + <message> -+ <location filename="../libs/libmythtv/videosource.cpp" line="3850"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="3860"/> + <source>New video source</source> + <translation>New Video Source</translation> </message> @@ -24060,7 +24175,7 @@ </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="3948"/> -+ <location filename="../libs/libmythtv/videosource.cpp" line="3830"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="3840"/> <source>Are you sure you want to delete ALL video sources?</source> <translation>Are you sure you want to delete ALL video sources?</translation> </message> @@ -24098,7 +24213,7 @@ <source>Video Source</source> <translation>Video Source</translation> </message> -@@ -31348,93 +32003,93 @@ +@@ -31348,93 +32043,93 @@ </message> <message> <location filename="../programs/mythfrontend/viewscheduled.cpp" line="226"/> @@ -24210,7 +24325,7 @@ <source>Delete '%1' %2 rule?</source> <translation>Delete '%1' %2 rule?</translation> </message> -@@ -31442,52 +32097,52 @@ +@@ -31442,52 +32137,52 @@ <context> <name>WatchListSettings</name> <message> @@ -24279,7 +24394,7 @@ <source>When an episode is deleted or marked as watched, other episodes of the series are excluded from the 'Watch List' for this interval of time. Daily shows also have a smaller interval based on this setting.</source> <translation>When an episode is deleted or marked as watched, other episodes of the series are excluded from the 'Watch List' for this interval of time. Daily shows also have a smaller interval based on this setting.</translation> </message> -@@ -31508,7 +32163,7 @@ +@@ -31508,7 +32203,7 @@ <message> <location filename="../programs/mythwelcome/welcomedialog.cpp" line="363"/> <source>Tuner %1 is recording:</source> @@ -24288,7 +24403,7 @@ </message> <message> <location filename="../programs/mythwelcome/welcomedialog.cpp" line="371"/> -@@ -31519,12 +32174,12 @@ +@@ -31519,12 +32214,12 @@ <message> <location filename="../programs/mythwelcome/welcomedialog.cpp" line="376"/> <source>There are no recordings currently taking place</source> @@ -24303,22 +24418,22 @@ </message> <message> <location filename="../programs/mythwelcome/welcomedialog.cpp" line="415"/> -@@ -31622,12 +32277,12 @@ +@@ -31622,12 +32317,12 @@ <message> <location filename="../programs/mythwelcome/welcomedialog.cpp" line="656"/> <source>Cannot shutdown because MythTV is currently recording</source> - <translation>Cannot shutdown because MythTV is currently recording</translation> -+ <translation>Cannot Shutdown Because MythTV Is Currently Recording</translation> ++ <translation>Cannot Shutdown Because MythTV is Currently Recording</translation> </message> <message> <location filename="../programs/mythwelcome/welcomedialog.cpp" line="667"/> <source>Cannot shutdown because MythTV is about to start recording</source> - <translation>Cannot shutdown because MythTV is about to start recording</translation> -+ <translation>Cannot Shutdown Because MythTV Is About to Start Recording</translation> ++ <translation>Cannot Shutdown Because MythTV is About to Start Recording</translation> </message> <message> <location filename="../programs/mythwelcome/welcomedialog.cpp" line="678"/> -@@ -31638,12 +32293,12 @@ +@@ -31638,12 +32333,12 @@ <context> <name>XMLTV_generic_config</name> <message> |