diff options
| author | Britney Fransen <brfransen@gmail.com> | 2018-06-25 20:05:36 (GMT) |
|---|---|---|
| committer | Britney Fransen <brfransen@gmail.com> | 2018-06-25 20:05:36 (GMT) |
| commit | dda78ea873382b1b7ed0f3868bb4c5f84b27418a (patch) | |
| tree | 1f1d949e747ff45c5b964256b34c02de877e22f2 /abs | |
| parent | 9cdb8144f8d6add081bf9aeadb4ec16ca9ba297a (diff) | |
| download | linhes_pkgbuild-dda78ea873382b1b7ed0f3868bb4c5f84b27418a.zip linhes_pkgbuild-dda78ea873382b1b7ed0f3868bb4c5f84b27418a.tar.gz linhes_pkgbuild-dda78ea873382b1b7ed0f3868bb4c5f84b27418a.tar.bz2 | |
mythtv & mythplugins: update to latest fixes
update translation path for some files
Diffstat (limited to 'abs')
5 files changed, 343 insertions, 310 deletions
diff --git a/abs/core/mythtv/stable-29/git_src/git_hash b/abs/core/mythtv/stable-29/git_src/git_hash index 98ae14a..d3aa589 100644 --- a/abs/core/mythtv/stable-29/git_src/git_hash +++ b/abs/core/mythtv/stable-29/git_src/git_hash @@ -1 +1 @@ -675676bb38ea8142931bd63861eef07e0164f2e6 +03d4baabf36088da8cc30840b4bdb4a3ef0a8a22 diff --git a/abs/core/mythtv/stable-29/mythplugins/PKGBUILD b/abs/core/mythtv/stable-29/mythplugins/PKGBUILD index abcff52..fc01856 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=6 +pkgrel=7 arch=('x86_64') url="http://www.mythtv.org" license=('GPL') diff --git a/abs/core/mythtv/stable-29/mythtv/PKGBUILD b/abs/core/mythtv/stable-29/mythtv/PKGBUILD index d74deb4..5061c20 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=6 +pkgrel=7 commit_hash=`cat ../git_src/git_hash` pkgdesc="A Homebrew PVR project $commit_hash" arch=('x86_64') @@ -138,8 +138,8 @@ md5sums=('fb5a87c52a31168a0c8fdde72f27cc45' '6add9c16bbb988067e82029327e567b2' 'b0b238320fa78a4928dce2cea7c85071' '8e4492d1777234a021f368bd6ee964ee' - 'da21518b594970b001476247aac4167c' - '17452a48ef2e27740f961480449b6303' + 'f2cb8dc8c4bff42102563a9e80011e19' + 'a1c7fb6a3bd11b7b21f2ea8327a843e1' 'd05eaf66c434a131c8efb4d87e99b402' '5f2bd4065b145b7b7ff09dfd6f08276c' '3cccbab70c7615bc47e51790e024d5bf' diff --git a/abs/core/mythtv/stable-29/mythtv/fixTranslations.patch b/abs/core/mythtv/stable-29/mythtv/fixTranslations.patch index 582afe0..b013470 100644 --- a/abs/core/mythtv/stable-29/mythtv/fixTranslations.patch +++ b/abs/core/mythtv/stable-29/mythtv/fixTranslations.patch @@ -76,3 +76,16 @@ index 6de0bae49d..bf24cc4f1a 100644 localServerIP = LocalServerIP(); localServerIP6 = LocalServerIP6(); +diff --git a/mythtv/i18n/translate.pro b/mythtv/i18n/translate.pro +index 210d9907f1..d51ec37ee5 100644 +--- a/mythtv/i18n/translate.pro ++++ b/mythtv/i18n/translate.pro +@@ -10,6 +10,8 @@ SOURCES += ../libs/libmyth/audio/*.cpp + SOURCES += ../libs/libmyth/audio/*.h + SOURCES += ../libs/libmythmetadata/*.cpp + SOURCES += ../libs/libmythmetadata/*.h ++SOURCES += ../libs/libmythservicecontracts/enums/*.cpp ++SOURCES += ../libs/libmythservicecontracts/enums/*.h + SOURCES += ../libs/libmythtv/*.cpp + SOURCES += ../libs/libmythtv/*.h + SOURCES += ../libs/libmythtv/AirPlay/*.cpp 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 04a74f6..59024b7 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-05-23 18:35:11.221352872 +0000 -+++ src/mythtv/i18n/mythfrontend_en_us.ts 2018-06-05 21:26:49.794659793 +0000 ++++ src/mythtv/i18n/mythfrontend_en_us.ts 2018-06-19 04:42:01.650264282 +0000 @@ -573,7 +573,7 @@ <message> <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="400"/> @@ -6389,14 +6389,15 @@ - <location filename="../programs/mythfrontend/guidegrid.cpp" line="1102"/> - <location filename="../programs/mythfrontend/guidegrid.cpp" line="1924"/> + <location filename="../programs/mythfrontend/guidegrid.cpp" line="1107"/> -+ <location filename="../programs/mythfrontend/guidegrid.cpp" line="1940"/> ++ <location filename="../programs/mythfrontend/guidegrid.cpp" line="1942"/> <source>Change to Channel</source> <translation>Change to Channel</translation> </message> <message> - <location filename="../programs/mythfrontend/guidegrid.cpp" line="1104"/> +- <location filename="../programs/mythfrontend/guidegrid.cpp" line="1928"/> + <location filename="../programs/mythfrontend/guidegrid.cpp" line="1109"/> - <location filename="../programs/mythfrontend/guidegrid.cpp" line="1928"/> ++ <location filename="../programs/mythfrontend/guidegrid.cpp" line="1930"/> <source>Watch This Channel</source> <translation>Watch This Channel</translation> </message> @@ -6404,7 +6405,7 @@ - <location filename="../programs/mythfrontend/guidegrid.cpp" line="1106"/> - <location filename="../programs/mythfrontend/guidegrid.cpp" line="1920"/> + <location filename="../programs/mythfrontend/guidegrid.cpp" line="1111"/> -+ <location filename="../programs/mythfrontend/guidegrid.cpp" line="1936"/> ++ <location filename="../programs/mythfrontend/guidegrid.cpp" line="1938"/> <source>Record This</source> <translation>Record This</translation> </message> @@ -6414,7 +6415,7 @@ - <location filename="../programs/mythfrontend/guidegrid.cpp" line="1961"/> + <location filename="../programs/mythfrontend/guidegrid.cpp" line="1113"/> + <location filename="../programs/mythfrontend/guidegrid.cpp" line="1143"/> -+ <location filename="../programs/mythfrontend/guidegrid.cpp" line="1971"/> ++ <location filename="../programs/mythfrontend/guidegrid.cpp" line="1973"/> <source>Recording Options</source> <translation>Recording Options</translation> </message> @@ -6422,7 +6423,7 @@ - <location filename="../programs/mythfrontend/guidegrid.cpp" line="1112"/> - <location filename="../programs/mythfrontend/guidegrid.cpp" line="1965"/> + <location filename="../programs/mythfrontend/guidegrid.cpp" line="1117"/> -+ <location filename="../programs/mythfrontend/guidegrid.cpp" line="1975"/> ++ <location filename="../programs/mythfrontend/guidegrid.cpp" line="1977"/> <source>Jump to Time</source> <translation>Jump to Time</translation> </message> @@ -6430,7 +6431,7 @@ - <location filename="../programs/mythfrontend/guidegrid.cpp" line="1116"/> - <location filename="../programs/mythfrontend/guidegrid.cpp" line="1944"/> + <location filename="../programs/mythfrontend/guidegrid.cpp" line="1121"/> -+ <location filename="../programs/mythfrontend/guidegrid.cpp" line="1954"/> ++ <location filename="../programs/mythfrontend/guidegrid.cpp" line="1956"/> <source>Channel Search</source> <translation>Channel Search</translation> </message> @@ -6438,7 +6439,7 @@ - <location filename="../programs/mythfrontend/guidegrid.cpp" line="1151"/> - <location filename="../programs/mythfrontend/guidegrid.cpp" line="1972"/> + <location filename="../programs/mythfrontend/guidegrid.cpp" line="1156"/> -+ <location filename="../programs/mythfrontend/guidegrid.cpp" line="1982"/> ++ <location filename="../programs/mythfrontend/guidegrid.cpp" line="1984"/> <source>Edit Recording Status</source> <translation>Edit Recording Status</translation> </message> @@ -6446,7 +6447,7 @@ - <location filename="../programs/mythfrontend/guidegrid.cpp" line="1152"/> - <location filename="../programs/mythfrontend/guidegrid.cpp" line="1976"/> + <location filename="../programs/mythfrontend/guidegrid.cpp" line="1157"/> -+ <location filename="../programs/mythfrontend/guidegrid.cpp" line="1986"/> ++ <location filename="../programs/mythfrontend/guidegrid.cpp" line="1988"/> <source>Edit Schedule</source> <translation>Edit Schedule</translation> </message> @@ -6454,7 +6455,7 @@ - <location filename="../programs/mythfrontend/guidegrid.cpp" line="1154"/> - <location filename="../programs/mythfrontend/guidegrid.cpp" line="1984"/> + <location filename="../programs/mythfrontend/guidegrid.cpp" line="1159"/> -+ <location filename="../programs/mythfrontend/guidegrid.cpp" line="1994"/> ++ <location filename="../programs/mythfrontend/guidegrid.cpp" line="1996"/> <source>Previously Recorded</source> <translation>Previously Recorded</translation> </message> @@ -6463,17 +6464,17 @@ - <location filename="../programs/mythfrontend/guidegrid.cpp" line="1863"/> - <location filename="../programs/mythfrontend/guidegrid.cpp" line="2235"/> - <location filename="../programs/mythfrontend/guidegrid.cpp" line="2236"/> -+ <location filename="../programs/mythfrontend/guidegrid.cpp" line="1704"/> -+ <location filename="../programs/mythfrontend/guidegrid.cpp" line="1871"/> -+ <location filename="../programs/mythfrontend/guidegrid.cpp" line="2242"/> -+ <location filename="../programs/mythfrontend/guidegrid.cpp" line="2243"/> ++ <location filename="../programs/mythfrontend/guidegrid.cpp" line="1706"/> ++ <location filename="../programs/mythfrontend/guidegrid.cpp" line="1873"/> ++ <location filename="../programs/mythfrontend/guidegrid.cpp" line="2244"/> ++ <location filename="../programs/mythfrontend/guidegrid.cpp" line="2245"/> <source>Unknown</source> <comment>Unknown program title</comment> <translation>Unknown</translation> </message> <message> - <location filename="../programs/mythfrontend/guidegrid.cpp" line="2730"/> -+ <location filename="../programs/mythfrontend/guidegrid.cpp" line="2737"/> ++ <location filename="../programs/mythfrontend/guidegrid.cpp" line="2739"/> <source>Jump to a specific date and time in the guide</source> - <translation>Jump to a specific date and time in the guide</translation> + <translation>Jump to a Specific Date and Time in the Guide</translation> @@ -6482,7 +6483,7 @@ - <location filename="../programs/mythfrontend/guidegrid.cpp" line="1110"/> - <location filename="../programs/mythfrontend/guidegrid.cpp" line="1934"/> + <location filename="../programs/mythfrontend/guidegrid.cpp" line="1115"/> -+ <location filename="../programs/mythfrontend/guidegrid.cpp" line="1944"/> ++ <location filename="../programs/mythfrontend/guidegrid.cpp" line="1946"/> <source>Program Details</source> <translation>Program Details</translation> </message> @@ -6490,7 +6491,7 @@ - <location filename="../programs/mythfrontend/guidegrid.cpp" line="1153"/> - <location filename="../programs/mythfrontend/guidegrid.cpp" line="1980"/> + <location filename="../programs/mythfrontend/guidegrid.cpp" line="1158"/> -+ <location filename="../programs/mythfrontend/guidegrid.cpp" line="1990"/> ++ <location filename="../programs/mythfrontend/guidegrid.cpp" line="1992"/> <source>Show Upcoming</source> <translation>Show Upcoming</translation> </message> @@ -6498,7 +6499,7 @@ - <location filename="../programs/mythfrontend/guidegrid.cpp" line="1155"/> - <location filename="../programs/mythfrontend/guidegrid.cpp" line="1988"/> + <location filename="../programs/mythfrontend/guidegrid.cpp" line="1160"/> -+ <location filename="../programs/mythfrontend/guidegrid.cpp" line="1998"/> ++ <location filename="../programs/mythfrontend/guidegrid.cpp" line="2000"/> <source>Custom Edit</source> <translation>Custom Edit</translation> </message> @@ -6506,7 +6507,7 @@ - <location filename="../programs/mythfrontend/guidegrid.cpp" line="1158"/> - <location filename="../programs/mythfrontend/guidegrid.cpp" line="1992"/> + <location filename="../programs/mythfrontend/guidegrid.cpp" line="1163"/> -+ <location filename="../programs/mythfrontend/guidegrid.cpp" line="2002"/> ++ <location filename="../programs/mythfrontend/guidegrid.cpp" line="2004"/> <source>Delete Rule</source> <translation>Delete Rule</translation> </message> @@ -6514,7 +6515,7 @@ - <location filename="../programs/mythfrontend/guidegrid.cpp" line="1114"/> - <location filename="../programs/mythfrontend/guidegrid.cpp" line="1938"/> + <location filename="../programs/mythfrontend/guidegrid.cpp" line="1119"/> -+ <location filename="../programs/mythfrontend/guidegrid.cpp" line="1948"/> ++ <location filename="../programs/mythfrontend/guidegrid.cpp" line="1950"/> <source>Reverse Channel Order</source> <translation>Reverse Channel Order</translation> </message> @@ -6522,7 +6523,7 @@ - <location filename="../programs/mythfrontend/guidegrid.cpp" line="1123"/> - <location filename="../programs/mythfrontend/guidegrid.cpp" line="1948"/> + <location filename="../programs/mythfrontend/guidegrid.cpp" line="1128"/> -+ <location filename="../programs/mythfrontend/guidegrid.cpp" line="1958"/> ++ <location filename="../programs/mythfrontend/guidegrid.cpp" line="1960"/> <source>Add To Channel Group</source> - <translation>Add To Channel Group</translation> + <translation>Add to Channel Group</translation> @@ -6531,7 +6532,7 @@ - <location filename="../programs/mythfrontend/guidegrid.cpp" line="1125"/> - <location filename="../programs/mythfrontend/guidegrid.cpp" line="1953"/> + <location filename="../programs/mythfrontend/guidegrid.cpp" line="1130"/> -+ <location filename="../programs/mythfrontend/guidegrid.cpp" line="1963"/> ++ <location filename="../programs/mythfrontend/guidegrid.cpp" line="1965"/> <source>Remove from Channel Group</source> <translation>Remove from Channel Group</translation> </message> @@ -6539,25 +6540,25 @@ - <location filename="../programs/mythfrontend/guidegrid.cpp" line="1120"/> - <location filename="../programs/mythfrontend/guidegrid.cpp" line="1957"/> + <location filename="../programs/mythfrontend/guidegrid.cpp" line="1125"/> -+ <location filename="../programs/mythfrontend/guidegrid.cpp" line="1967"/> ++ <location filename="../programs/mythfrontend/guidegrid.cpp" line="1969"/> <source>Choose Channel Group</source> <translation>Choose Channel Group</translation> </message> <message> - <location filename="../programs/mythfrontend/guidegrid.cpp" line="2289"/> -+ <location filename="../programs/mythfrontend/guidegrid.cpp" line="2296"/> ++ <location filename="../programs/mythfrontend/guidegrid.cpp" line="2298"/> <source>You don't have any channel groups defined</source> <translation>You don't have any channel groups defined</translation> </message> <message> - <location filename="../programs/mythfrontend/guidegrid.cpp" line="2303"/> -+ <location filename="../programs/mythfrontend/guidegrid.cpp" line="2310"/> ++ <location filename="../programs/mythfrontend/guidegrid.cpp" line="2312"/> <source>Select Channel Group</source> <translation>Select Channel Group</translation> </message> <message> - <location filename="../programs/mythfrontend/guidegrid.cpp" line="2588"/> -+ <location filename="../programs/mythfrontend/guidegrid.cpp" line="2595"/> ++ <location filename="../programs/mythfrontend/guidegrid.cpp" line="2597"/> <source>Delete '%1' %2 rule?</source> <translation>Delete '%1' %2 rule?</translation> </message> @@ -7838,14 +7839,14 @@ <source>Your iPhone, iPad, iPod Touch, or iTunes on your computer will prompt you for this password when required</source> - <translation>Your iPhone, iPad, iPod Touch, or iTunes on your computer will prompt you for this password when required</translation> + <translation>Your iPhone, iPad, iPod Touch, or iTunes on your computer will prompt you for this password when required.</translation> - </message> - <message> -- <location filename="../programs/mythfrontend/globalsettings.cpp" line="3140"/> ++ </message> ++ <message> + <location filename="../programs/mythfrontend/globalsettings.cpp" line="3137"/> + <source>AirPlay - Password</source> + <translation>AirPlay - Password</translation> -+ </message> -+ <message> + </message> + <message> +- <location filename="../programs/mythfrontend/globalsettings.cpp" line="3140"/> + <location filename="../programs/mythfrontend/globalsettings.cpp" line="3148"/> <source>AirPlay full screen playback</source> - <translation>AirPlay full screen playback</translation> @@ -7893,14 +7894,14 @@ + <location filename="../programs/mythfrontend/globalsettings.cpp" line="3325"/> + <source>This enables support for monitoring your CD/DVD drives for new disks and launching the proper plugin to handle them. Requires restart.</source> + <translation>This enables support for monitoring your CD/DVD drives for new disks and launching the proper plugin to handle them. Requires restart.</translation> - </message> - <message> -- <location filename="../programs/mythfrontend/globalsettings.cpp" line="3848"/> ++ </message> ++ <message> + <location filename="../programs/mythfrontend/globalsettings.cpp" line="3808"/> + <source>Main Settings</source> + <translation>Main Settings</translation> -+ </message> -+ <message> + </message> + <message> +- <location filename="../programs/mythfrontend/globalsettings.cpp" line="3848"/> + <location filename="../programs/mythfrontend/globalsettings.cpp" line="3813"/> <source>Settings Access</source> <translation>Settings Access</translation> @@ -12447,14 +12448,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="920"/> ++ </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> + </message> + <message> +- <location filename="../programs/mythfrontend/globalsettings.cpp" line="920"/> + <location filename="../programs/mythfrontend/globalsettings.cpp" line="953"/> <source>Main deinterlacing method. %1</source> - <translation>Main deinterlacing method. %1</translation> @@ -13332,15 +13333,14 @@ <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> @@ -13951,7 +13951,7 @@ <source>%n minute(s)</source> <translation> <numerusform>%n minute</numerusform> -@@ -15307,24 +15884,24 @@ +@@ -15307,24 +15884,25 @@ </translation> </message> <message> @@ -13974,6 +13974,7 @@ - <location filename="../libs/libmyth/programtypes.cpp" line="212"/> + <location filename="../libs/libmyth/programinfo.cpp" line="1781"/> + <location filename="../libs/libmyth/programinfo.cpp" line="1786"/> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="172"/> <source>Repeat</source> <translation>Repeat</translation> </message> @@ -13983,7 +13984,7 @@ <source>%n star(s)</source> <translation> <numerusform>%n star</numerusform> -@@ -15333,60 +15910,57 @@ +@@ -15333,60 +15911,60 @@ </message> <message> <location filename="../libs/libmythtv/channelinfo.cpp" line="280"/> @@ -14006,6 +14007,8 @@ - <location filename="../libs/libmyth/programtypes.cpp" line="231"/> + <location filename="../libs/libmyth/programinfo.cpp" line="3125"/> + <location filename="../libs/libmyth/programinfo.cpp" line="4994"/> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="188"/> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="191"/> <location filename="../libs/libmythtv/videoouttypes.h" line="137"/> <location filename="../libs/libmythtv/videoouttypes.h" line="160"/> - <location filename="../programs/mythfrontend/statusbox.cpp" line="1053"/> @@ -14023,6 +14026,7 @@ - <location filename="../libs/libmyth/programinfo.cpp" line="3122"/> - <location filename="../libs/libmyth/programtypes.cpp" line="185"/> + <location filename="../libs/libmyth/programinfo.cpp" line="3136"/> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="143"/> <source>Recording</source> <translation>Recording</translation> </message> @@ -14056,7 +14060,7 @@ <source>File transfer</source> <translation>File transfer</translation> </message> -@@ -15436,47 +16010,47 @@ +@@ -15436,47 +16014,47 @@ <message> <location filename="../libs/libmyth/recordingtypes.cpp" line="55"/> <source>Record only this showing</source> @@ -14113,447 +14117,459 @@ </message> <message> <location filename="../libs/libmyth/recordingtypes.cpp" line="137"/> -@@ -15513,655 +16087,585 @@ +@@ -15513,655 +16091,665 @@ <translation>Override Recording</translation> </message> <message> - <location filename="../libs/libmyth/programtypes.cpp" line="176"/> <location filename="../libs/libmyth/recordingtypes.cpp" line="45"/> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="134"/> <source>Not Recording</source> <translation>Not Recording</translation> </message> <message> - <location filename="../libs/libmyth/programtypes.cpp" line="181"/> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="139"/> <source>Aborted</source> -- <translation>Aborted</translation> -+ <translation type="vanished">Aborted</translation> + <translation>Aborted</translation> </message> <message> - <location filename="../libs/libmyth/programtypes.cpp" line="183"/> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="141"/> <source>Recorded</source> -- <translation>Recorded</translation> -+ <translation type="vanished">Recorded</translation> + <translation>Recorded</translation> </message> <message> - <location filename="../libs/libmyth/programtypes.cpp" line="187"/> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="145"/> <source>Tuning</source> -- <translation>Tuning</translation> -+ <translation type="vanished">Tuning</translation> + <translation>Tuning</translation> </message> <message> - <location filename="../libs/libmyth/programtypes.cpp" line="191"/> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="149"/> <source>Will Record</source> -- <translation>Will Record</translation> -+ <translation type="vanished">Will Record</translation> + <translation>Will Record</translation> </message> <message> - <location filename="../libs/libmyth/programtypes.cpp" line="193"/> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="151"/> ++ <source>Pending</source> ++ <translation>Pending</translation> ++ </message> ++ <message> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="153"/> <source>Don't Record</source> -- <translation>Don't Record</translation> -+ <translation type="vanished">Don't Record</translation> + <translation>Don't Record</translation> </message> <message> - <location filename="../libs/libmyth/programtypes.cpp" line="195"/> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="155"/> <source>Previously Recorded</source> -- <translation>Previously Recorded</translation> -+ <translation type="vanished">Previously Recorded</translation> + <translation>Previously Recorded</translation> </message> <message> - <location filename="../libs/libmyth/programtypes.cpp" line="197"/> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="157"/> <source>Currently Recorded</source> -- <translation>Currently Recorded</translation> -+ <translation type="vanished">Currently Recorded</translation> + <translation>Currently Recorded</translation> </message> <message> - <location filename="../libs/libmyth/programtypes.cpp" line="199"/> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="159"/> <source>Earlier Showing</source> -- <translation>Earlier Showing</translation> -+ <translation type="vanished">Earlier Showing</translation> + <translation>Earlier Showing</translation> </message> <message> - <location filename="../libs/libmyth/programtypes.cpp" line="201"/> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="161"/> <source>Max Recordings</source> -- <translation>Max Recordings</translation> -+ <translation type="vanished">Max Recordings</translation> + <translation>Max Recordings</translation> </message> <message> - <location filename="../libs/libmyth/programtypes.cpp" line="203"/> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="163"/> <source>Manual Cancel</source> -- <translation>Manual Cancel</translation> -+ <translation type="vanished">Manual Cancel</translation> + <translation>Manual Cancel</translation> </message> <message> - <location filename="../libs/libmyth/programtypes.cpp" line="206"/> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="166"/> <source>Missed</source> -- <translation>Missed</translation> -+ <translation type="vanished">Missed</translation> + <translation>Missed</translation> </message> <message> - <location filename="../libs/libmyth/programtypes.cpp" line="208"/> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="168"/> <source>Conflicting</source> -- <translation>Conflicting</translation> -+ <translation type="vanished">Conflicting</translation> + <translation>Conflicting</translation> </message> <message> - <location filename="../libs/libmyth/programtypes.cpp" line="210"/> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="170"/> <source>Later Showing</source> -- <translation>Later Showing</translation> -+ <translation type="vanished">Later Showing</translation> + <translation>Later Showing</translation> </message> <message> - <location filename="../libs/libmyth/programtypes.cpp" line="214"/> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="174"/> <source>Inactive</source> -- <translation>Inactive</translation> -+ <translation type="vanished">Inactive</translation> + <translation>Inactive</translation> </message> <message> - <location filename="../libs/libmyth/programtypes.cpp" line="216"/> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="176"/> <source>Low Disk Space</source> -- <translation>Low Disk Space</translation> -+ <translation type="vanished">Low Disk Space</translation> + <translation>Low Disk Space</translation> </message> <message> - <location filename="../libs/libmyth/programtypes.cpp" line="218"/> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="178"/> <source>Tuner Busy</source> -- <translation>Tuner Busy</translation> -+ <translation type="vanished">Tuner Busy</translation> + <translation>Tuner Busy</translation> </message> <message> - <location filename="../libs/libmyth/programtypes.cpp" line="220"/> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="180"/> <source>Recorder Failed</source> -- <translation>Recorder Failed</translation> -+ <translation type="vanished">Recorder Failed</translation> + <translation>Recorder Failed</translation> </message> <message> - <location filename="../libs/libmyth/programtypes.cpp" line="222"/> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="182"/> <source>Not Listed</source> -- <translation>Not Listed</translation> -+ <translation type="vanished">Not Listed</translation> + <translation>Not Listed</translation> </message> <message> - <location filename="../libs/libmyth/programtypes.cpp" line="224"/> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="184"/> <source>Never Record</source> -- <translation>Never Record</translation> -+ <translation type="vanished">Never Record</translation> + <translation>Never Record</translation> </message> <message> - <location filename="../libs/libmyth/programtypes.cpp" line="226"/> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="186"/> <source>Recorder Off-Line</source> -- <translation>Recorder Off-Line</translation> -+ <translation type="vanished">Recorder Off-Line</translation> + <translation>Recorder Off-Line</translation> </message> <message> - <location filename="../libs/libmyth/programtypes.cpp" line="239"/> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="199"/> <source>This showing is not scheduled to record</source> - <translation>This showing is not scheduled to record</translation> -+ <translation type="vanished">This showing is not scheduled to record.</translation> ++ <translation>This showing is not scheduled to record.</translation> </message> <message> - <location filename="../libs/libmyth/programtypes.cpp" line="249"/> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="209"/> <source>This showing will be recorded.</source> -- <translation>This showing will be recorded.</translation> -+ <translation type="vanished">This showing will be recorded.</translation> + <translation>This showing will be recorded.</translation> </message> <message> - <location filename="../libs/libmyth/programtypes.cpp" line="252"/> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="212"/> ++ <source>This showing is about to record.</source> ++ <translation>This showing is about to record.</translation> ++ </message> ++ <message> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="215"/> <source>This showing is being recorded.</source> -- <translation>This showing is being recorded.</translation> -+ <translation type="vanished">This showing is being recorded.</translation> + <translation>This showing is being recorded.</translation> </message> <message> - <location filename="../libs/libmyth/programtypes.cpp" line="262"/> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="225"/> <source>This showing was recorded.</source> -- <translation>This showing was recorded.</translation> -+ <translation type="vanished">This showing was recorded.</translation> + <translation>This showing was recorded.</translation> </message> <message> - <location filename="../libs/libmyth/programtypes.cpp" line="265"/> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="228"/> <source>This showing was recorded but was aborted before completion.</source> -- <translation>This showing was recorded but was aborted before completion.</translation> -+ <translation type="vanished">This showing was recorded but was aborted before completion.</translation> + <translation>This showing was recorded but was aborted before completion.</translation> </message> <message> - <location filename="../libs/libmyth/programtypes.cpp" line="270"/> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="233"/> <source>This showing was not recorded because the master backend was not running.</source> -- <translation>This showing was not recorded because the master backend was not running.</translation> -+ <translation type="vanished">This showing was not recorded because the master backend was not running.</translation> + <translation>This showing was not recorded because the master backend was not running.</translation> </message> <message> - <location filename="../libs/libmyth/programtypes.cpp" line="278"/> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="241"/> <source>This showing was not recorded because there wasn't enough disk space.</source> -- <translation>This showing was not recorded because there wasn't enough disk space.</translation> -+ <translation type="vanished">This showing was not recorded because there wasn't enough disk space.</translation> + <translation>This showing was not recorded because there wasn't enough disk space.</translation> </message> <message> - <location filename="../libs/libmyth/programtypes.cpp" line="282"/> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="245"/> <source>This showing was not recorded because the recorder was already in use.</source> -- <translation>This showing was not recorded because the recorder was already in use.</translation> -+ <translation type="vanished">This showing was not recorded because the recorder was already in use.</translation> + <translation>This showing was not recorded because the recorder was already in use.</translation> </message> <message> - <location filename="../libs/libmyth/programtypes.cpp" line="286"/> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="249"/> <source>This showing was not recorded because the recorder failed.</source> -- <translation>This showing was not recorded because the recorder failed.</translation> -+ <translation type="vanished">This showing was not recorded because the recorder failed.</translation> + <translation>This showing was not recorded because the recorder failed.</translation> </message> <message> - <location filename="../libs/libmyth/programtypes.cpp" line="330"/> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="293"/> <source>this episode will be recorded at a later time instead.</source> -- <translation>this episode will be recorded at a later time instead.</translation> -+ <translation type="vanished">this episode will be recorded at a later time instead.</translation> + <translation>this episode will be recorded at a later time instead.</translation> </message> <message> - <location filename="../libs/libmyth/programtypes.cpp" line="347"/> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="310"/> <source>the required recorder is off-line.</source> -- <translation>the required recorder is off-line.</translation> -+ <translation type="vanished">the required recorder is off-line.</translation> + <translation>the required recorder is off-line.</translation> </message> <message> - <location filename="../libs/libmyth/programtypes.cpp" line="274"/> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="237"/> <source>This showing was not recorded because it was manually cancelled.</source> -- <translation>This showing was not recorded because it was manually cancelled.</translation> -+ <translation type="vanished">This showing was not recorded because it was manually cancelled.</translation> + <translation>This showing was not recorded because it was manually cancelled.</translation> </message> <message> - <location filename="../libs/libmyth/programtypes.cpp" line="96"/> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="51"/> <source>A</source> <comment>RecStatusChar RecStatus::Aborted</comment> -- <translation>A</translation> -+ <translation type="vanished">A</translation> + <translation>A</translation> </message> <message> - <location filename="../libs/libmyth/programtypes.cpp" line="99"/> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="54"/> <source>R</source> <comment>RecStatusChar RecStatus::Recorded</comment> -- <translation>R</translation> -+ <translation type="vanished">R</translation> + <translation>R</translation> </message> <message> - <location filename="../libs/libmyth/programtypes.cpp" line="114"/> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="72"/> <source>X</source> <comment>RecStatusChar RecStatus::DontRecord</comment> -- <translation>X</translation> -+ <translation type="vanished">X</translation> + <translation>X</translation> </message> <message> - <location filename="../libs/libmyth/programtypes.cpp" line="117"/> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="75"/> <source>P</source> <comment>RecStatusChar RecStatus::PreviousRecording</comment> -- <translation>P</translation> -+ <translation type="vanished">P</translation> + <translation>P</translation> </message> <message> - <location filename="../libs/libmyth/programtypes.cpp" line="120"/> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="78"/> <source>R</source> <comment>RecStatusChar RecStatus::CurrentRecording</comment> -- <translation>R</translation> -+ <translation type="vanished">R</translation> + <translation>R</translation> </message> <message> - <location filename="../libs/libmyth/programtypes.cpp" line="123"/> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="81"/> <source>E</source> <comment>RecStatusChar RecStatus::EarlierShowing</comment> -- <translation>E</translation> -+ <translation type="vanished">E</translation> + <translation>E</translation> </message> <message> - <location filename="../libs/libmyth/programtypes.cpp" line="126"/> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="84"/> <source>T</source> <comment>RecStatusChar RecStatus::TooManyRecordings</comment> -- <translation>T</translation> -+ <translation type="vanished">T</translation> + <translation>T</translation> </message> <message> - <location filename="../libs/libmyth/programtypes.cpp" line="129"/> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="87"/> <source>c</source> <comment>RecStatusChar RecStatus::Cancelled</comment> -- <translation>c</translation> -+ <translation type="vanished">c</translation> + <translation>c</translation> </message> <message> - <location filename="../libs/libmyth/programtypes.cpp" line="133"/> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="91"/> <source>M</source> <comment>RecStatusChar RecStatus::Missed</comment> -- <translation>M</translation> -+ <translation type="vanished">M</translation> + <translation>M</translation> </message> <message> - <location filename="../libs/libmyth/programtypes.cpp" line="136"/> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="94"/> <source>C</source> <comment>RecStatusChar RecStatus::Conflict</comment> -- <translation>C</translation> -+ <translation type="vanished">C</translation> + <translation>C</translation> </message> <message> - <location filename="../libs/libmyth/programtypes.cpp" line="139"/> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="97"/> <source>L</source> <comment>RecStatusChar RecStatus::LaterShowing</comment> -- <translation>L</translation> -+ <translation type="vanished">L</translation> + <translation>L</translation> </message> <message> - <location filename="../libs/libmyth/programtypes.cpp" line="142"/> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="100"/> <source>r</source> <comment>RecStatusChar RecStatus::Repeat</comment> -- <translation>r</translation> -+ <translation type="vanished">r</translation> + <translation>r</translation> </message> <message> - <location filename="../libs/libmyth/programtypes.cpp" line="145"/> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="103"/> <source>x</source> <comment>RecStatusChar RecStatus::Inactive</comment> -- <translation>x</translation> -+ <translation type="vanished">x</translation> + <translation>x</translation> </message> <message> - <location filename="../libs/libmyth/programtypes.cpp" line="148"/> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="106"/> <source>K</source> <comment>RecStatusChar RecStatus::LowDiskSpace</comment> -- <translation>K</translation> -+ <translation type="vanished">K</translation> + <translation>K</translation> </message> <message> - <location filename="../libs/libmyth/programtypes.cpp" line="151"/> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="109"/> <source>B</source> <comment>RecStatusChar RecStatus::TunerBusy</comment> -- <translation>B</translation> -+ <translation type="vanished">B</translation> + <translation>B</translation> </message> <message> - <location filename="../libs/libmyth/programtypes.cpp" line="154"/> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="112"/> <source>f</source> <comment>RecStatusChar RecStatus::Failed</comment> -- <translation>f</translation> -+ <translation type="vanished">f</translation> + <translation>f</translation> </message> <message> - <location filename="../libs/libmyth/programtypes.cpp" line="157"/> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="115"/> <source>N</source> <comment>RecStatusChar RecStatus::NotListed</comment> -- <translation>N</translation> -+ <translation type="vanished">N</translation> + <translation>N</translation> </message> <message> - <location filename="../libs/libmyth/programtypes.cpp" line="160"/> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="118"/> <source>V</source> <comment>RecStatusChar RecStatus::NeverRecord</comment> -- <translation>V</translation> -+ <translation type="vanished">V</translation> + <translation>V</translation> </message> <message> - <location filename="../libs/libmyth/programtypes.cpp" line="163"/> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="121"/> <source>F</source> <comment>RecStatusChar RecStatus::Offline</comment> -- <translation>F</translation> -+ <translation type="vanished">F</translation> + <translation>F</translation> </message> <message> - <location filename="../libs/libmyth/programtypes.cpp" line="189"/> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="147"/> <source>Failing</source> -- <translation>Failing</translation> -+ <translation type="vanished">Failing</translation> + <translation>Failing</translation> </message> <message> - <location filename="../libs/libmyth/programtypes.cpp" line="258"/> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="221"/> <source>The showing is failing to record because of errors.</source> -- <translation>The showing is failing to record because of errors.</translation> -+ <translation type="vanished">The showing is failing to record because of errors.</translation> + <translation>The showing is failing to record because of errors.</translation> </message> <message> - <location filename="../libs/libmyth/programtypes.cpp" line="351"/> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="314"/> <source>This showing will not be recorded.</source> -- <translation>This showing will not be recorded.</translation> -+ <translation type="vanished">This showing will not be recorded.</translation> + <translation>This showing will not be recorded.</translation> </message> <message> - <location filename="../libs/libmyth/programtypes.cpp" line="353"/> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="316"/> <source>This showing was not recorded.</source> -- <translation>This showing was not recorded.</translation> -+ <translation type="vanished">This showing was not recorded.</translation> + <translation>This showing was not recorded.</translation> </message> <message> - <location filename="../libs/libmyth/programtypes.cpp" line="290"/> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="253"/> <source>The status of this showing is unknown.</source> -- <translation>The status of this showing is unknown.</translation> -+ <translation type="vanished">The status of this showing is unknown.</translation> + <translation>The status of this showing is unknown.</translation> </message> <message> - <location filename="../libs/libmyth/programtypes.cpp" line="255"/> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="218"/> <source>The showing is being tuned.</source> -- <translation>The showing is being tuned.</translation> -+ <translation type="vanished">The showing is being tuned.</translation> + <translation>The showing is being tuned.</translation> </message> <message> - <location filename="../libs/libmyth/programtypes.cpp" line="298"/> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="261"/> <source>This showing will not be recorded because </source> -- <translation>This showing will not be recorded because </translation> -+ <translation type="vanished">This showing will not be recorded because </translation> + <translation>This showing will not be recorded because </translation> </message> <message> - <location filename="../libs/libmyth/programtypes.cpp" line="300"/> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="263"/> <source>This showing was not recorded because </source> -- <translation>This showing was not recorded because </translation> -+ <translation type="vanished">This showing was not recorded because </translation> + <translation>This showing was not recorded because </translation> </message> <message> - <location filename="../libs/libmyth/programtypes.cpp" line="305"/> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="268"/> <source>it was manually set to not record.</source> -- <translation>it was manually set to not record.</translation> -+ <translation type="vanished">it was manually set to not record.</translation> + <translation>it was manually set to not record.</translation> </message> <message> - <location filename="../libs/libmyth/programtypes.cpp" line="308"/> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="271"/> <source>this episode was previously recorded according to the duplicate policy chosen for this title.</source> -- <translation>this episode was previously recorded according to the duplicate policy chosen for this title.</translation> -+ <translation type="vanished">this episode was previously recorded according to the duplicate policy chosen for this title.</translation> + <translation>this episode was previously recorded according to the duplicate policy chosen for this title.</translation> </message> <message> - <location filename="../libs/libmyth/programtypes.cpp" line="313"/> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="276"/> <source>this episode was previously recorded and is still available in the list of recordings.</source> -- <translation>this episode was previously recorded and is still available in the list of recordings.</translation> -+ <translation type="vanished">this episode was previously recorded and is still available in the list of recordings.</translation> + <translation>this episode was previously recorded and is still available in the list of recordings.</translation> </message> <message> - <location filename="../libs/libmyth/programtypes.cpp" line="318"/> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="281"/> <source>this episode will be recorded at an earlier time instead.</source> -- <translation>this episode will be recorded at an earlier time instead.</translation> -+ <translation type="vanished">this episode will be recorded at an earlier time instead.</translation> + <translation>this episode will be recorded at an earlier time instead.</translation> </message> <message> - <location filename="../libs/libmyth/programtypes.cpp" line="322"/> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="285"/> <source>too many recordings of this program have already been recorded.</source> -- <translation>too many recordings of this program have already been recorded.</translation> -+ <translation type="vanished">too many recordings of this program have already been recorded.</translation> + <translation>too many recordings of this program have already been recorded.</translation> </message> <message> - <location filename="../libs/libmyth/programtypes.cpp" line="326"/> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="289"/> <source>another program with a higher priority will be recorded.</source> -- <translation>another program with a higher priority will be recorded.</translation> -+ <translation type="vanished">another program with a higher priority will be recorded.</translation> + <translation>another program with a higher priority will be recorded.</translation> </message> <message> - <location filename="../libs/libmyth/programtypes.cpp" line="334"/> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="297"/> <source>this episode is a repeat.</source> -- <translation>this episode is a repeat.</translation> -+ <translation type="vanished">this episode is a repeat.</translation> + <translation>this episode is a repeat.</translation> </message> <message> - <location filename="../libs/libmyth/programtypes.cpp" line="337"/> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="300"/> <source>this recording rule is inactive.</source> -- <translation>this recording rule is inactive.</translation> -+ <translation type="vanished">this recording rule is inactive.</translation> + <translation>this recording rule is inactive.</translation> </message> <message> - <location filename="../libs/libmyth/programtypes.cpp" line="340"/> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="303"/> <source>this rule does not match any showings in the current program listings.</source> -- <translation>this rule does not match any showings in the current program listings.</translation> -+ <translation type="vanished">this rule does not match any showings in the current program listings.</translation> + <translation>this rule does not match any showings in the current program listings.</translation> </message> <message> - <location filename="../libs/libmyth/programtypes.cpp" line="344"/> ++ <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="307"/> <source>it was marked to never be recorded.</source> -- <translation>it was marked to never be recorded.</translation> -+ <translation type="vanished">it was marked to never be recorded.</translation> + <translation>it was marked to never be recorded.</translation> </message> <message> - <location filename="../libs/libmyth/programinfo.cpp" line="5223"/> @@ -14888,7 +14904,7 @@ <source>Pre & Post Roll</source> <translation>Pre & Post Roll</translation> </message> -@@ -16222,17 +16726,17 @@ +@@ -16222,17 +16810,17 @@ <message> <location filename="../libs/libmythtv/decoderbase.cpp" line="1130"/> <source>Audio track</source> @@ -14909,7 +14925,7 @@ </message> <message> <location filename="../libs/libmythtv/decoderbase.cpp" line="1136"/> -@@ -16307,208 +16811,212 @@ +@@ -16307,208 +16895,212 @@ <translation>Normal</translation> </message> <message> @@ -15182,7 +15198,7 @@ <source>, firmware: %2</source> <translation>, firmware: %2</translation> </message> -@@ -16518,13 +17026,13 @@ +@@ -16518,13 +17110,13 @@ <translation>Sports</translation> </message> <message> @@ -15194,12 +15210,12 @@ <message> - <location filename="../programs/mythfrontend/guidegrid.cpp" line="2012"/> - <location filename="../programs/mythfrontend/guidegrid.cpp" line="2319"/> -+ <location filename="../programs/mythfrontend/guidegrid.cpp" line="2022"/> -+ <location filename="../programs/mythfrontend/guidegrid.cpp" line="2326"/> ++ <location filename="../programs/mythfrontend/guidegrid.cpp" line="2024"/> ++ <location filename="../programs/mythfrontend/guidegrid.cpp" line="2328"/> <source>All Channels</source> <translation>All Channels</translation> </message> -@@ -16541,12 +17049,12 @@ +@@ -16541,12 +17133,12 @@ <message> <location filename="../libs/libmythtv/channelscan/channelscan_sm.cpp" line="293"/> <source>Failed to add channel %1</source> @@ -15214,7 +15230,7 @@ </message> <message> <location filename="../libs/libmythtv/channelscan/channelscan_sm.cpp" line="895"/> -@@ -16556,7 +17064,7 @@ +@@ -16556,7 +17148,7 @@ <message> <location filename="../libs/libmythtv/channelscan/channelscan_sm.cpp" line="896"/> <source>Unknown decryption status</source> @@ -15223,7 +15239,7 @@ </message> <message> <location filename="../libs/libmythtv/channelscan/channelscan_sm.cpp" line="898"/> -@@ -16571,41 +17079,41 @@ +@@ -16571,41 +17163,41 @@ <message> <location filename="../libs/libmythtv/channelscan/channelscan_sm.cpp" line="935"/> <source>%1 -- Timed out</source> @@ -15273,7 +15289,7 @@ <source>: Found %n</source> <translation> <numerusform>: Found %n</numerusform> -@@ -16613,28 +17121,28 @@ +@@ -16613,28 +17205,28 @@ </translation> </message> <message> @@ -15308,7 +15324,7 @@ <source>Broadcast</source> <translation>Broadcast</translation> </message> -@@ -16648,7 +17156,7 @@ +@@ -16648,7 +17240,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"/> @@ -15317,7 +15333,7 @@ <source>High</source> <translation>High</translation> </message> -@@ -16758,9 +17266,9 @@ +@@ -16758,9 +17350,9 @@ <translation>France</translation> </message> <message> @@ -15330,7 +15346,7 @@ <source>Frequency</source> <translation>Frequency</translation> </message> -@@ -16785,30 +17293,30 @@ +@@ -16785,30 +17377,30 @@ <translation>Hue</translation> </message> <message> @@ -15365,7 +15381,7 @@ <source>Analog</source> <translation>Analog</translation> </message> -@@ -16824,532 +17332,523 @@ +@@ -16824,532 +17416,523 @@ <translation>Play</translation> </message> <message> @@ -16053,7 +16069,7 @@ </message> <message> <location filename="../programs/mythfrontend/programrecpriority.cpp" line="123"/> -@@ -17357,410 +17856,418 @@ +@@ -17357,410 +17940,418 @@ <translation>Default (Template)</translation> </message> <message> @@ -16584,7 +16600,7 @@ </message> <message> <location filename="../libs/libmythtv/tv.cpp" line="55"/> -@@ -17786,448 +18293,464 @@ +@@ -17786,448 +18377,464 @@ <message> <location filename="../libs/libmythtv/tv.cpp" line="85"/> <source>Auto-Skip OFF</source> @@ -17154,7 +17170,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 +18911,240 @@ +@@ -18388,217 +18995,240 @@ <translation>Volume</translation> </message> <message> @@ -17278,14 +17294,14 @@ <source>VBI device</source> - <translation>VBI device</translation> + <translation>VBI Device</translation> - </message> - <message> -- <location filename="../libs/libmythtv/videosource.cpp" line="948"/> ++ </message> ++ <message> + <location filename="../libs/libmythtv/videosource.cpp" line="969"/> + <source>Specify the command to run, with any needed arguments.</source> + <translation>Specify the command to run, with any needed arguments.</translation> -+ </message> -+ <message> + </message> + <message> +- <location filename="../libs/libmythtv/videosource.cpp" line="948"/> + <location filename="../libs/libmythtv/videosource.cpp" line="993"/> <source>Audio device</source> - <translation>Audio device</translation> @@ -17470,7 +17486,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 +19153,475 @@ +@@ -18607,472 +19237,475 @@ Your grabber does not provide channel numbers, so you have to set them manually.</translation> </message> <message> @@ -18097,7 +18113,7 @@ <source>This is updated on every successful channel change.</source> <translation>This is updated on every successful channel change.</translation> </message> -@@ -19082,48 +19631,48 @@ +@@ -19082,48 +19715,48 @@ <translation>The following programs will be recorded instead:</translation> </message> <message> @@ -18158,7 +18174,7 @@ </message> <message> <location filename="../programs/mythfrontend/setupwizard_audio.cpp" line="295"/> -@@ -19136,24 +19685,23 @@ +@@ -19136,24 +19769,23 @@ <translation>Audio device is invalid or not useable.</translation> </message> <message> @@ -18187,7 +18203,7 @@ </message> <message> <location filename="../libs/libmyth/mythmediamonitor.cpp" line="37"/> -@@ -19161,12 +19709,12 @@ +@@ -19161,12 +19793,12 @@ <translation>Media Monitor</translation> </message> <message> @@ -18202,7 +18218,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 +19730,769 @@ +@@ -19182,722 +19814,769 @@ </message> <message> <location filename="../programs/mythtranscode/main.cpp" line="97"/> @@ -19185,7 +19201,7 @@ <source>UPnP Server Settings</source> <translation>UPnP Server Settings</translation> </message> -@@ -19915,12 +20510,12 @@ +@@ -19915,12 +20594,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> @@ -19200,7 +19216,7 @@ </message> <message> <location filename="../programs/mythtv-setup/checksetup.cpp" line="217"/> -@@ -19928,12 +20523,12 @@ +@@ -19928,12 +20607,12 @@ <translation>Card %1 (type %2) is set to start on channel %3, which does not exist.</translation> </message> <message> @@ -19216,7 +19232,7 @@ <source>MythTV Setup</source> <translation>MythTV Setup</translation> </message> -@@ -19971,19 +20566,19 @@ +@@ -19971,19 +20650,19 @@ <translation>Backlinks</translation> </message> <message> @@ -19239,7 +19255,7 @@ </message> <message> <location filename="../programs/mythfrontend/videolist.cpp" line="646"/> -@@ -19994,7 +20589,7 @@ +@@ -19994,7 +20673,7 @@ <message> <location filename="../programs/mythfrontend/videolist.cpp" line="656"/> <source>No files found</source> @@ -19248,7 +19264,7 @@ </message> <message> <location filename="../programs/mythfrontend/videolist.cpp" line="952"/> -@@ -20075,57 +20670,57 @@ +@@ -20075,57 +20754,57 @@ <translation>videos</translation> </message> <message> @@ -19317,7 +19333,7 @@ <source>%1 KB</source> <translation>%1 KB</translation> </message> -@@ -20150,17 +20745,17 @@ +@@ -20150,17 +20829,17 @@ <message> <location filename="../libs/libmyth/recordingtypes.cpp" line="251"/> <source>Match duplicates using subtitle & description</source> @@ -19338,7 +19354,7 @@ </message> <message> <location filename="../libs/libmyth/recordingtypes.cpp" line="230"/> -@@ -20180,22 +20775,22 @@ +@@ -20180,22 +20859,22 @@ <message> <location filename="../libs/libmyth/recordingtypes.cpp" line="249"/> <source>Match duplicates using description</source> @@ -19365,7 +19381,7 @@ </message> <message> <location filename="../libs/libmyth/recordingtypes.cpp" line="160"/> -@@ -20221,90 +20816,90 @@ +@@ -20221,90 +20900,90 @@ <message> <location filename="../libs/libmyth/recordingtypes.cpp" line="179"/> <source>Look for duplicates in previous recordings only</source> @@ -19488,7 +19504,7 @@ <source>Run '%1'</source> <translation>Run '%1'</translation> </message> -@@ -20335,97 +20930,97 @@ +@@ -20335,97 +21014,97 @@ <translation>SetParameters() called with handle == NULL!</translation> </message> <message> @@ -19608,7 +19624,7 @@ <source>film</source> <translation>film</translation> </message> -@@ -20433,56 +21028,56 @@ +@@ -20433,56 +21112,56 @@ <location filename="../programs/mythshutdown/main.cpp" line="72"/> <source>Error: Database not open while trying to load setting: %1</source> <comment>mythshutdown</comment> @@ -19674,7 +19690,7 @@ </message> <message> <location filename="../programs/mythshutdown/main.cpp" line="317"/> -@@ -20500,176 +21095,176 @@ +@@ -20500,176 +21179,176 @@ <location filename="../programs/mythshutdown/main.cpp" line="342"/> <source>About to start daily wakeup period (1)</source> <comment>mythshutdown</comment> @@ -19880,7 +19896,7 @@ </message> <message> <location filename="../programs/mythshutdown/main.cpp" line="760"/> -@@ -20686,14 +21281,14 @@ +@@ -20686,14 +21365,14 @@ must be yyyy-MM-ddThh:mm:ss</translation> </message> <message> @@ -19898,7 +19914,7 @@ </message> <message> <location filename="../programs/mythbackend/upnpcdsmusic.cpp" line="105"/> -@@ -20717,6 +21312,11 @@ +@@ -20717,6 +21396,11 @@ <source>Genre</source> <translation>Genre</translation> </message> @@ -19910,7 +19926,7 @@ </context> <context> <name>RawSettingsEditor</name> -@@ -20729,12 +21329,12 @@ +@@ -20729,12 +21413,12 @@ <context> <name>RecMetadataEdit</name> <message> @@ -19926,7 +19942,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 +21342,18 @@ +@@ -20742,14 +21426,18 @@ <context> <name>RecordingProfileEditor</name> <message> @@ -19949,7 +19965,7 @@ </message> </context> <context> -@@ -20822,128 +21426,130 @@ +@@ -20822,128 +21510,130 @@ <message> <location filename="../libs/libmythtv/channelscan/scanmonitor.cpp" line="117"/> <source>Scanning</source> @@ -20127,7 +20143,7 @@ </message> </context> <context> -@@ -20951,168 +21557,173 @@ +@@ -20951,168 +21641,173 @@ <message> <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="52"/> <source>New episode</source> @@ -20365,7 +20381,7 @@ </message> </context> <context> -@@ -21147,75 +21758,75 @@ +@@ -21147,75 +21842,75 @@ </message> <message> <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="576"/> @@ -20455,7 +20471,7 @@ <source>Default</source> <translation>Default</translation> </message> -@@ -21251,7 +21862,7 @@ +@@ -21251,7 +21946,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> @@ -20464,7 +20480,7 @@ </message> <message> <location filename="../libs/libmyth/schemawizard.cpp" line="317"/> -@@ -21316,7 +21927,7 @@ +@@ -21316,7 +22011,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> @@ -20473,7 +20489,7 @@ </message> </context> <context> -@@ -21324,68 +21935,116 @@ +@@ -21324,68 +22019,116 @@ <message> <location filename="../libs/libmythtv/signalmonitorvalue.cpp" line="24"/> <source>Could not open tuner device</source> @@ -20604,7 +20620,7 @@ </message> <message> <location filename="../programs/mythtv-setup/startprompt.cpp" line="73"/> -@@ -21395,7 +22054,7 @@ +@@ -21395,7 +22138,7 @@ <message> <location filename="../programs/mythtv-setup/startprompt.cpp" line="77"/> <source>Recording Status: RECORDING.</source> @@ -20613,7 +20629,7 @@ </message> <message> <location filename="../programs/mythtv-setup/startprompt.cpp" line="78"/> -@@ -21405,7 +22064,7 @@ +@@ -21405,7 +22148,7 @@ <message> <location filename="../programs/mythtv-setup/startprompt.cpp" line="82"/> <source>Recording Status: None.</source> @@ -20622,7 +20638,7 @@ </message> <message> <location filename="../programs/mythtv-setup/startprompt.cpp" line="103"/> -@@ -21426,15 +22085,15 @@ +@@ -21426,15 +22169,15 @@ <context> <name>StartingChannel</name> <message> @@ -20641,7 +20657,7 @@ <source>%n (is) LiveTV and consume(s) %1 </source> <translation> -@@ -21445,7 +22104,7 @@ +@@ -21445,7 +22188,7 @@ </translation> </message> <message numerus="yes"> @@ -20650,7 +20666,7 @@ <source>%n (is) Deleted and consume(s) %1 </source> <translation> -@@ -21457,7 +22116,7 @@ +@@ -21457,7 +22200,7 @@ </message> <message numerus="yes"> <location filename="../programs/mythfrontend/statusbox.cpp" line="592"/> @@ -20659,7 +20675,7 @@ <source>%n day(s)</source> <translation> <numerusform>%n day</numerusform> -@@ -21568,7 +22227,7 @@ +@@ -21568,7 +22311,7 @@ <message> <location filename="../programs/mythfrontend/statusbox.cpp" line="370"/> <source>Move to Default group</source> @@ -20668,7 +20684,7 @@ </message> <message> <location filename="../programs/mythfrontend/statusbox.cpp" line="374"/> -@@ -21588,7 +22247,7 @@ +@@ -21588,7 +22331,7 @@ <message> <location filename="../programs/mythfrontend/statusbox.cpp" line="546"/> <source>Mythfrontend version: %1 (%2)</source> @@ -20677,7 +20693,7 @@ </message> <message> <location filename="../programs/mythfrontend/statusbox.cpp" line="548"/> -@@ -21633,7 +22292,7 @@ +@@ -21633,7 +22376,7 @@ <message> <location filename="../programs/mythfrontend/statusbox.cpp" line="597"/> <source>WARNING: is mythfilldatabase running?</source> @@ -20686,7 +20702,7 @@ </message> <message> <location filename="../programs/mythfrontend/statusbox.cpp" line="602"/> -@@ -21678,47 +22337,47 @@ +@@ -21678,47 +22421,47 @@ </translation> </message> <message> @@ -20743,7 +20759,7 @@ <source>On %1 from %2.%3 %4 </source> -@@ -21726,27 +22385,27 @@ +@@ -21726,27 +22469,27 @@ %4</translation> </message> <message> @@ -20776,7 +20792,7 @@ <source>%n hour(s)</source> <translation> <numerusform>%n hour</numerusform> -@@ -21754,7 +22413,7 @@ +@@ -21754,7 +22497,7 @@ </translation> </message> <message numerus="yes"> @@ -20785,7 +20801,7 @@ <source>%n minute(s)</source> <translation> <numerusform>%n minute</numerusform> -@@ -21762,178 +22421,178 @@ +@@ -21762,178 +22505,182 @@ </translation> </message> <message> @@ -20922,6 +20938,10 @@ <message> - <location filename="../programs/mythfrontend/statusbox.cpp" line="1230"/> - <location filename="../programs/mythfrontend/statusbox.cpp" line="1278"/> ++ <source>Hostname</source> ++ <translation type="obsolete">Hostname</translation> ++ </message> ++ <message> + <location filename="../programs/mythfrontend/statusbox.cpp" line="1237"/> + <location filename="../programs/mythfrontend/statusbox.cpp" line="1285"/> <source>Load</source> @@ -21004,7 +21024,7 @@ <source>%n recording(s) consuming %1 (is) allowed to expire </source> <translation> -@@ -21945,58 +22604,81 @@ +@@ -21945,58 +22692,81 @@ </message> </context> <context> @@ -21103,7 +21123,7 @@ <source>(Add New Directory)</source> <translation>(Add New Directory)</translation> </message> -@@ -22004,168 +22686,170 @@ +@@ -22004,168 +22774,170 @@ <context> <name>StorageGroupListEditor</name> <message> @@ -21330,7 +21350,7 @@ <source>Sorry, PBP only supports %n video stream(s)</source> <translation> <numerusform>Sorry, PBP only supports %n video stream</numerusform> -@@ -22173,7 +22857,7 @@ +@@ -22173,7 +22945,7 @@ </translation> </message> <message numerus="yes"> @@ -21339,7 +21359,7 @@ <source>Sorry, PIP only supports %n video stream(s)</source> <translation> <numerusform>Sorry, PIP only supports %n video stream</numerusform> -@@ -22181,266 +22865,266 @@ +@@ -22181,266 +22953,266 @@ </translation> </message> <message> @@ -21675,7 +21695,7 @@ <location filename="../libs/libmythtv/tvbrowsehelper.cpp" line="26"/> <location filename="../libs/libmythtv/tvbrowsehelper.cpp" line="310"/> <source>%n minute(s)</source> -@@ -22450,425 +23134,425 @@ +@@ -22450,425 +23222,425 @@ </translation> </message> <message> @@ -22202,7 +22222,7 @@ <source>Close PIP(s)</source> <translation> <numerusform>Close PIP</numerusform> -@@ -22876,7 +23560,7 @@ +@@ -22876,7 +23648,7 @@ </translation> </message> <message numerus="yes"> @@ -22211,7 +22231,7 @@ <source>Close PBP(s)</source> <translation> <numerusform>Close PBP</numerusform> -@@ -22884,701 +23568,701 @@ +@@ -22884,701 +23656,701 @@ </translation> </message> <message> @@ -23011,7 +23031,7 @@ + <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 </translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="13323"/> @@ -23083,7 +23103,7 @@ <source>Taking more than %1 ms to get a lock.</source> <translation>Taking more than %1 ms to get a lock.</translation> </message> -@@ -23586,133 +24270,133 @@ +@@ -23586,133 +24358,133 @@ <context> <name>ThemeChooser</name> <message> @@ -23253,7 +23273,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 +24660,7 @@ +@@ -23976,7 +24748,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> @@ -23262,7 +23282,7 @@ </message> <message> <location filename="../themes/themestrings.h" line="851"/> -@@ -24130,7 +24814,7 @@ +@@ -24130,7 +24902,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> @@ -23271,7 +23291,7 @@ </message> <message> <location filename="../themes/themestrings.h" line="866"/> -@@ -24317,7 +25001,7 @@ +@@ -24317,7 +25089,7 @@ <message> <location filename="../themes/themestrings.h" line="890"/> <source>Allow Recordings to Auto-Expire</source> @@ -23280,7 +23300,7 @@ </message> <message> <location filename="../themes/themestrings.h" line="891"/> -@@ -24397,7 +25081,7 @@ +@@ -24397,7 +25169,7 @@ <message> <location filename="../themes/themestrings.h" line="908"/> <source>Type your tweet below. Select "Send" to submit it.</source> @@ -23289,7 +23309,7 @@ </message> <message> <location filename="../themes/themestrings.h" line="909"/> -@@ -24452,7 +25136,7 @@ +@@ -24452,7 +25224,7 @@ <message> <location filename="../themes/themestrings.h" line="390"/> <source>WARNING: There are conflicting scheduled recordings!</source> @@ -23298,7 +23318,7 @@ </message> <message> <location filename="../themes/themestrings.h" line="954"/> -@@ -24604,7 +25288,7 @@ +@@ -24604,7 +25376,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> @@ -23307,7 +23327,7 @@ </message> <message> <location filename="../themes/themestrings.h" line="1011"/> -@@ -25307,7 +25991,7 @@ +@@ -25307,7 +26079,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> @@ -23316,7 +23336,7 @@ </message> <message> <location filename="../themes/themestrings.h" line="1083"/> -@@ -25332,7 +26016,7 @@ +@@ -25332,7 +26104,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> @@ -23325,7 +23345,7 @@ </message> <message> <location filename="../themes/themestrings.h" line="745"/> -@@ -25376,7 +26060,7 @@ +@@ -25376,7 +26148,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> @@ -23334,7 +23354,7 @@ </message> <message> <location filename="../themes/themestrings.h" line="1123"/> -@@ -25627,7 +26311,7 @@ +@@ -25627,7 +26399,7 @@ <message> <location filename="../themes/themestrings.h" line="1172"/> <source>Protocol-Version: %1</source> @@ -23343,7 +23363,7 @@ </message> <message> <location filename="../themes/themestrings.h" line="1173"/> -@@ -25860,7 +26544,7 @@ +@@ -25860,7 +26632,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> @@ -23352,7 +23372,7 @@ </message> <message> <location filename="../themes/themestrings.h" line="417"/> -@@ -26303,7 +26987,7 @@ +@@ -26303,7 +27075,7 @@ <message> <location filename="../themes/themestrings.h" line="638"/> <source>Ok</source> @@ -23361,7 +23381,7 @@ </message> <message> <location filename="../themes/themestrings.h" line="639"/> -@@ -26423,7 +27107,7 @@ +@@ -26423,7 +27195,7 @@ <message> <location filename="../themes/themestrings.h" line="665"/> <source>PCM-BluRay</source> @@ -23370,7 +23390,7 @@ </message> <message> <location filename="../themes/themestrings.h" line="666"/> -@@ -26618,7 +27302,7 @@ +@@ -26618,7 +27390,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> @@ -23379,7 +23399,7 @@ </message> <message> <location filename="../themes/themestrings.h" line="708"/> -@@ -26902,7 +27586,7 @@ +@@ -26902,7 +27674,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> @@ -23388,7 +23408,7 @@ </message> <message> <location filename="../themes/themestrings.h" line="803"/> -@@ -27454,7 +28138,7 @@ +@@ -27454,7 +28226,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> @@ -23397,7 +23417,7 @@ </message> <message> <location filename="../themes/themestrings.h" line="1107"/> -@@ -28434,7 +29118,7 @@ +@@ -28434,7 +29206,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> @@ -23406,7 +23426,7 @@ </message> <message> <location filename="../themes/themestrings.h" line="303"/> -@@ -28564,7 +29248,7 @@ +@@ -28564,7 +29336,7 @@ <message> <location filename="../themes/themestrings.h" line="478"/> <source>Post-Processing Options</source> @@ -23415,7 +23435,7 @@ </message> <message> <location filename="../themes/themestrings.h" line="279"/> -@@ -28851,9 +29535,9 @@ +@@ -28851,9 +29623,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> @@ -23427,7 +23447,7 @@ </message> <message> <location filename="../themes/themestrings.h" line="922"/> -@@ -29298,7 +29982,7 @@ +@@ -29298,7 +30070,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> @@ -23436,7 +23456,7 @@ </message> <message> <location filename="../themes/themestrings.h" line="160"/> -@@ -29674,12 +30358,12 @@ +@@ -29674,12 +30446,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> @@ -23451,7 +23471,7 @@ </message> <message> <location filename="../themes/themestrings.h" line="20"/> -@@ -29699,12 +30383,12 @@ +@@ -29699,12 +30471,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> @@ -23466,7 +23486,7 @@ </message> <message> <location filename="../themes/themestrings.h" line="394"/> -@@ -29954,7 +30638,7 @@ +@@ -29954,7 +30726,7 @@ <context> <name>ThemeUpdateChecker</name> <message> @@ -23475,7 +23495,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 +30675,12 @@ +@@ -29991,12 +30763,12 @@ <message> <location filename="../programs/mythfrontend/galleryconfig.cpp" line="22"/> <source>Exif Date (oldest first)</source> @@ -23490,7 +23510,7 @@ </message> <message> <location filename="../programs/mythfrontend/galleryconfig.cpp" line="24"/> -@@ -30046,12 +30730,23 @@ +@@ -30046,12 +30818,23 @@ <translation>Date Format</translation> </message> <message> @@ -23515,7 +23535,7 @@ <name>Transition</name> <message> <location filename="../programs/mythfrontend/gallerytransitions.h" line="103"/> -@@ -30087,45 +30782,46 @@ +@@ -30087,45 +30870,46 @@ <context> <name>TransportList</name> <message> @@ -23574,7 +23594,7 @@ <source>Delete...</source> <translation>Delete...</translation> </message> -@@ -30133,8 +30829,8 @@ +@@ -30133,8 +30917,8 @@ <context> <name>UPNPScanner</name> <message> @@ -23585,7 +23605,7 @@ <source>Media Servers</source> <translation>Media Servers</translation> </message> -@@ -30230,89 +30926,89 @@ +@@ -30230,89 +31014,89 @@ <context> <name>V4L2encGroup</name> <message> @@ -23697,7 +23717,7 @@ <source>Done</source> <translation>Done</translation> </message> -@@ -30320,35 +31016,34 @@ +@@ -30320,35 +31104,34 @@ <context> <name>VBoxConfigurationGroup</name> <message> @@ -23741,7 +23761,7 @@ <source>Manually Enter IP Address</source> <translation>Manually Enter IP Address</translation> </message> -@@ -30449,7 +31144,7 @@ +@@ -30449,7 +31232,7 @@ <message> <location filename="../programs/mythfrontend/videodlg.cpp" line="2503"/> <source>Play With Trailers</source> @@ -23750,7 +23770,7 @@ </message> <message> <location filename="../programs/mythfrontend/videodlg.cpp" line="2510"/> -@@ -30464,7 +31159,7 @@ +@@ -30464,7 +31247,7 @@ <message> <location filename="../programs/mythfrontend/videodlg.cpp" line="2526"/> <source>Scan For Changes</source> @@ -23759,7 +23779,7 @@ </message> <message> <location filename="../programs/mythfrontend/videodlg.cpp" line="2527"/> -@@ -30490,12 +31185,12 @@ +@@ -30490,12 +31273,12 @@ <message> <location filename="../programs/mythfrontend/videodlg.cpp" line="3374"/> <source>Failed to retrieve image(s)</source> @@ -23774,7 +23794,7 @@ </message> <message> <location filename="../programs/mythfrontend/videodlg.cpp" line="3836"/> -@@ -30521,12 +31216,12 @@ +@@ -30521,12 +31304,12 @@ <message> <location filename="../programs/mythfrontend/videodlg.cpp" line="2177"/> <source>Retrieved details for %1</source> @@ -23789,7 +23809,7 @@ </message> <message> <location filename="../programs/mythfrontend/videodlg.cpp" line="2552"/> -@@ -30706,7 +31401,7 @@ +@@ -30706,7 +31489,7 @@ <message> <location filename="../programs/mythfrontend/videodlg.cpp" line="2152"/> <source>Fetching details for %1</source> @@ -23798,7 +23818,7 @@ </message> <message> <location filename="../programs/mythfrontend/videodlg.cpp" line="3557"/> -@@ -30718,7 +31413,7 @@ +@@ -30718,7 +31501,7 @@ <message> <location filename="../programs/mythfrontend/videodlg.cpp" line="3595"/> <source>Failed to delete file</source> @@ -23807,7 +23827,7 @@ </message> </context> <context> -@@ -30901,7 +31596,7 @@ +@@ -30901,7 +31684,7 @@ <message> <location filename="../programs/mythfrontend/videoglobalsettings.cpp" line="106"/> <source>Directories that hold videos</source> @@ -23816,7 +23836,7 @@ </message> <message> <location filename="../programs/mythfrontend/videoglobalsettings.cpp" line="110"/> -@@ -30911,7 +31606,7 @@ +@@ -30911,7 +31694,7 @@ <message> <location filename="../programs/mythfrontend/videoglobalsettings.cpp" line="122"/> <source>Directory that holds movie posters</source> @@ -23825,7 +23845,7 @@ </message> <message> <location filename="../programs/mythfrontend/videoglobalsettings.cpp" line="127"/> -@@ -30925,37 +31620,37 @@ +@@ -30925,37 +31708,37 @@ <message> <location filename="../programs/mythfrontend/videoglobalsettings.cpp" line="138"/> <source>Directory that holds movie screenshots</source> @@ -23870,7 +23890,7 @@ </message> <message> <location filename="../programs/mythfrontend/videoglobalsettings.cpp" line="211"/> -@@ -30970,7 +31665,7 @@ +@@ -30970,7 +31753,7 @@ <message> <location filename="../programs/mythfrontend/videoglobalsettings.cpp" line="224"/> <source>Video Tree remembers last selected position</source> @@ -23879,7 +23899,7 @@ </message> <message> <location filename="../programs/mythfrontend/videoglobalsettings.cpp" line="229"/> -@@ -30978,58 +31673,62 @@ +@@ -30978,58 +31761,62 @@ <translation>If set, the current position in the Video Tree is persistent.</translation> </message> <message> @@ -23954,7 +23974,7 @@ </message> </context> <context> -@@ -31057,118 +31756,117 @@ +@@ -31057,118 +31844,117 @@ <context> <name>VideoModeSettings</name> <message> @@ -24099,7 +24119,7 @@ <source>Zoom %1x%2 @ (%3,%4)</source> <translation>Zoom %1x%2 @ (%3,%4)</translation> </message> -@@ -31194,17 +31892,17 @@ +@@ -31194,17 +31980,17 @@ <message> <location filename="../libs/libmythmetadata/videoscan.cpp" line="181"/> <source>Searching for video files</source> @@ -24120,7 +24140,7 @@ </message> </context> <context> -@@ -31212,17 +31910,17 @@ +@@ -31212,17 +31998,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> @@ -24141,7 +24161,7 @@ </message> <message> <location filename="../programs/mythfrontend/setupwizard_video.cpp" line="79"/> -@@ -31275,56 +31973,53 @@ +@@ -31275,56 +32061,53 @@ <context> <name>VideoSourceEditor</name> <message> @@ -24214,7 +24234,7 @@ <source>Video Source</source> <translation>Video Source</translation> </message> -@@ -31348,93 +32043,93 @@ +@@ -31348,93 +32131,93 @@ </message> <message> <location filename="../programs/mythfrontend/viewscheduled.cpp" line="226"/> @@ -24326,7 +24346,7 @@ <source>Delete '%1' %2 rule?</source> <translation>Delete '%1' %2 rule?</translation> </message> -@@ -31442,52 +32137,52 @@ +@@ -31442,52 +32225,52 @@ <context> <name>WatchListSettings</name> <message> @@ -24395,7 +24415,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 +32203,7 @@ +@@ -31508,7 +32291,7 @@ <message> <location filename="../programs/mythwelcome/welcomedialog.cpp" line="363"/> <source>Tuner %1 is recording:</source> @@ -24404,7 +24424,7 @@ </message> <message> <location filename="../programs/mythwelcome/welcomedialog.cpp" line="371"/> -@@ -31519,12 +32214,12 @@ +@@ -31519,12 +32302,12 @@ <message> <location filename="../programs/mythwelcome/welcomedialog.cpp" line="376"/> <source>There are no recordings currently taking place</source> @@ -24419,7 +24439,7 @@ </message> <message> <location filename="../programs/mythwelcome/welcomedialog.cpp" line="415"/> -@@ -31622,12 +32317,12 @@ +@@ -31622,12 +32405,12 @@ <message> <location filename="../programs/mythwelcome/welcomedialog.cpp" line="656"/> <source>Cannot shutdown because MythTV is currently recording</source> @@ -24434,7 +24454,7 @@ </message> <message> <location filename="../programs/mythwelcome/welcomedialog.cpp" line="678"/> -@@ -31638,12 +32333,12 @@ +@@ -31638,12 +32421,12 @@ <context> <name>XMLTV_generic_config</name> <message> |