From cc934e5a0641d0409b77ca13a3c371b4a42035d0 Mon Sep 17 00:00:00 2001 From: Britney Fransen <brfransen@gmail.com> Date: Fri, 27 Oct 2017 13:31:11 +0000 Subject: mythtv & mythplugins: update to latest fixes --- abs/core/mythtv/stable-29/git_src/git_hash | 2 +- abs/core/mythtv/stable-29/git_src/git_hash_web | 2 +- abs/core/mythtv/stable-29/mythplugins/PKGBUILD | 2 +- abs/core/mythtv/stable-29/mythtv/PKGBUILD | 4 +- .../mythtv/mythfrontend_en_us.ts_Title_Case.patch | 377 ++++++++++++++++++++- abs/core/mythtv/stable-29/mythweb/PKGBUILD | 2 +- 6 files changed, 381 insertions(+), 8 deletions(-) diff --git a/abs/core/mythtv/stable-29/git_src/git_hash b/abs/core/mythtv/stable-29/git_src/git_hash index 96e8004..8f59c1a 100644 --- a/abs/core/mythtv/stable-29/git_src/git_hash +++ b/abs/core/mythtv/stable-29/git_src/git_hash @@ -1 +1 @@ -7080df5b71a707b070f05ef729b88dce5400652e +cf364afa843b91c301c2c6e18669f4adb6726a0c diff --git a/abs/core/mythtv/stable-29/git_src/git_hash_web b/abs/core/mythtv/stable-29/git_src/git_hash_web index 96322d1..5d42c24 100644 --- a/abs/core/mythtv/stable-29/git_src/git_hash_web +++ b/abs/core/mythtv/stable-29/git_src/git_hash_web @@ -1 +1 @@ -ece58ebc66872e5a9b6e748f36304bd474d8c902 +6db62758ba7f06eb916a041292f50ec298cc01b0 diff --git a/abs/core/mythtv/stable-29/mythplugins/PKGBUILD b/abs/core/mythtv/stable-29/mythplugins/PKGBUILD index d2c6d54..a972167 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 -pkgrel=3 +pkgrel=4 arch=('i686' '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 c509b8d..f8a403c 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 -pkgrel=3 +pkgrel=4 commit_hash=`cat ../git_src/git_hash` pkgdesc="A Homebrew PVR project $commit_hash" arch=('i686' 'x86_64') @@ -124,5 +124,5 @@ md5sums=('fb5a87c52a31168a0c8fdde72f27cc45' '0f674b9cad031ba1e03aaf6b5ee1499f' '6add9c16bbb988067e82029327e567b2' 'b0b238320fa78a4928dce2cea7c85071' - 'decae343fa612feb6609c65d1fc2ad14' + '116ccb5662fd543f4f6088b3ba64945b' '633cd853a89aeee5388daaad21ccec28') 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 3e7a738..044930c 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,339 @@ ---- src/mythtv/i18n/mythfrontend_en_us.ts.orig 2017-03-17 14:20:37.088541193 +0000 -+++ src/mythtv/i18n/mythfrontend_en_us.ts 2017-03-17 14:20:03.206227232 +0000 +--- src/mythtv/i18n/mythfrontend_en_us.ts.orig 2017-10-26 20:49:34.106521527 +0000 ++++ src/mythtv/i18n/mythfrontend_en_us.ts 2017-10-26 20:46:35.659655601 +0000 +@@ -634,17 +634,17 @@ + <message> + <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="434"/> + <source>Children-special</source> +- <translation>Children-special</translation> ++ <translation>Children-Special</translation> + </message> + <message> + <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="436"/> + <source>Children-news</source> +- <translation>Children-news</translation> ++ <translation>Children-News</translation> + </message> + <message> + <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="438"/> + <source>Children-music</source> +- <translation>Children-music</translation> ++ <translation>Children-Music</translation> + </message> + <message> + <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="440"/> +@@ -654,7 +654,7 @@ + <message> + <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="444"/> + <source>Comedy-drama</source> +- <translation>Comedy-drama</translation> ++ <translation>Comedy-Drama</translation> + </message> + <message> + <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="446"/> +@@ -670,7 +670,7 @@ + <message> + <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="452"/> + <source>Crime drama</source> +- <translation>Crime drama</translation> ++ <translation>Crime Drama</translation> + </message> + <message> + <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="456"/> +@@ -695,7 +695,7 @@ + <message> + <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="478"/> + <source>Game show</source> +- <translation>Game show</translation> ++ <translation>Game Show</translation> + </message> + <message> + <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="482"/> +@@ -705,7 +705,7 @@ + <message> + <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="488"/> + <source>Historical drama</source> +- <translation>Historical drama</translation> ++ <translation>Historical Drama</translation> + </message> + <message> + <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="492"/> +@@ -715,32 +715,32 @@ + <message> + <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="494"/> + <source>Holiday-children</source> +- <translation>Holiday-children</translation> ++ <translation>Holiday-Children</translation> + </message> + <message> + <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>Holiday-Children Special</translation> + </message> + <message> + <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="498"/> + <source>Holiday special</source> +- <translation>Holiday special</translation> ++ <translation>Holiday Special</translation> + </message> + <message> + <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="502"/> + <source>Horse racing</source> +- <translation>Horse racing</translation> ++ <translation>Horse Racing</translation> + </message> + <message> + <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="504"/> + <source>House/garden</source> +- <translation>House/garden</translation> ++ <translation>House/Garden</translation> + </message> + <message> + <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="506"/> + <source>How-to</source> +- <translation>How-to</translation> ++ <translation>How-To</translation> + </message> + <message> + <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="510"/> +@@ -765,12 +765,12 @@ + <message> + <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="524"/> + <source>Music special</source> +- <translation>Music special</translation> ++ <translation>Music Special</translation> + </message> + <message> + <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="526"/> + <source>Music talk</source> +- <translation>Music talk</translation> ++ <translation>Music Talk</translation> + </message> + <message> + <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="528"/> +@@ -779,7 +779,7 @@ + </message> + <message> + <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="530"/> +- <source>Musical comedy</source> ++ <source>Musical Comedy</source> + <translation>Musical comedy</translation> + </message> + <message> +@@ -795,7 +795,7 @@ + <message> + <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="542"/> + <source>Public affairs</source> +- <translation>Public affairs</translation> ++ <translation>Public Affairs</translation> + </message> + <message> + <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="544"/> +@@ -810,7 +810,7 @@ + <message> + <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="552"/> + <source>Romance-comedy</source> +- <translation>Romance-comedy</translation> ++ <translation>Romance-Comedy</translation> + </message> + <message> + <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="554"/> +@@ -825,12 +825,12 @@ + <message> + <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="560"/> + <source>Science fiction</source> +- <translation>Science fiction</translation> ++ <translation>Science Fiction</translation> + </message> + <message> + <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="562"/> + <source>Self improvement</source> +- <translation>Self improvement</translation> ++ <translation>Self Improvement</translation> + </message> + <message> + <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="566"/> +@@ -860,12 +860,12 @@ + <message> + <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="578"/> + <source>Sports non-event</source> +- <translation>Sports non-event</translation> ++ <translation>Sports Non-Event</translation> + </message> + <message> + <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="580"/> + <source>Sports talk</source> +- <translation>Sports talk</translation> ++ <translation>Sports Talk</translation> + </message> + <message> + <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="584"/> +@@ -875,7 +875,7 @@ + <message> + <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="590"/> + <source>Track/field</source> +- <translation>Track/field</translation> ++ <translation>Track/Field</translation> + </message> + <message> + <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="596"/> +@@ -920,7 +920,7 @@ + <message> + <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="616"/> + <source>Arts/crafts</source> +- <translation>Arts/crafts</translation> ++ <translation>Arts/Crafts</translation> + </message> + <message> + <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="618"/> +@@ -930,12 +930,12 @@ + <message> + <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="620"/> + <source>Auto racing</source> +- <translation>Auto racing</translation> ++ <translation>Auto Racing</translation> + </message> + <message> + <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="622"/> + <source>Air racing</source> +- <translation>Air racing</translation> ++ <translation>Air Racing</translation> + </message> + <message> + <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="624"/> +@@ -945,7 +945,7 @@ + <message> + <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="626"/> + <source>Bicycle racing</source> +- <translation>Bicycle racing</translation> ++ <translation>Bicycle Racing</translation> + </message> + <message> + <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="628"/> +@@ -965,12 +965,12 @@ + <message> + <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="636"/> + <source>Dog show</source> +- <translation>Dog show</translation> ++ <translation>Dog Show</translation> + </message> + <message> + <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="638"/> + <source>Drag racing</source> +- <translation>Drag racing</translation> ++ <translation>Drag Racing</translation> + </message> + <message> + <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="642"/> +@@ -986,12 +986,12 @@ + <message> + <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="646"/> + <source>Field hockey</source> +- <translation>Field hockey</translation> ++ <translation>Field Hockey</translation> + </message> + <message> + <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="650"/> + <source>Gay/lesbian</source> +- <translation>Gay/lesbian</translation> ++ <translation>Gay/Lesbian</translation> + </message> + <message> + <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="652"/> +@@ -1001,7 +1001,7 @@ + <message> + <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="654"/> + <source>Home improvement</source> +- <translation>Home improvement</translation> ++ <translation>Home Improvement</translation> + </message> + <message> + <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="656"/> +@@ -1011,7 +1011,7 @@ + <message> + <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="658"/> + <source>Hydroplane racing</source> +- <translation>Hydroplane racing</translation> ++ <translation>Hydroplane Racing</translation> + </message> + <message> + <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="660"/> +@@ -1021,7 +1021,7 @@ + <message> + <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="662"/> + <source>Motorcycle racing</source> +- <translation>Motorcycle racing</translation> ++ <translation>Motorcycle Racing</translation> + </message> + <message> + <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="664"/> +@@ -1047,7 +1047,7 @@ + <message> + <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="674"/> + <source>Pro wrestling</source> +- <translation>Pro wrestling</translation> ++ <translation>Pro Wrestling</translation> + </message> + <message> + <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="676"/> +@@ -1092,7 +1092,7 @@ + <message> + <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="694"/> + <source>Card games</source> +- <translation>Card games</translation> ++ <translation>Card Games</translation> + </message> + <message> + <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="696"/> +@@ -1107,12 +1107,12 @@ + <message> + <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="702"/> + <source>Mixed martial arts</source> +- <translation>Mixed martial arts</translation> ++ <translation>Mixed Martial Arts</translation> + </message> + <message> + <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="704"/> + <source>Action sports</source> +- <translation>Action sports</translation> ++ <translation>Action Sports</translation> + </message> + <message> + <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="706"/> +@@ -1144,7 +1144,7 @@ + <message> + <location filename="../libs/libmythtv/mpeg/dvbdescriptors.cpp" line="326"/> + <source>Soap/melodrama/folkloric</source> +- <translation>Soap/melodrama/folkloric</translation> ++ <translation>Soap/Melodrama/Folkloric</translation> + </message> + <message> + <location filename="../libs/libmythtv/mpeg/dvbdescriptors.cpp" line="333"/> +@@ -1160,12 +1160,12 @@ + <message> + <location filename="../libs/libmythtv/mpeg/dvbdescriptors.cpp" line="341"/> + <source>News/weather report</source> +- <translation>News/weather report</translation> ++ <translation>News/Weather Report</translation> + </message> + <message> + <location filename="../libs/libmythtv/mpeg/dvbdescriptors.cpp" line="343"/> + <source>News magazine</source> +- <translation>News magazine</translation> ++ <translation>News Magazine</translation> + </message> + <message> + <location filename="../libs/libmythtv/mpeg/dvbdescriptors.cpp" line="347"/> +@@ -1440,7 +1440,7 @@ + <message> + <location filename="../libs/libmythtv/mpeg/dvbdescriptors.cpp" line="473"/> + <source>Advertizement/Shopping</source> +- <translation>Advertizement/Shopping</translation> ++ <translation>Advertisement/Shopping</translation> + </message> + <message> + <location filename="../libs/libmythtv/mpeg/dvbdescriptors.cpp" line="475"/> @@ -3349,12 +3349,12 @@ <message> <location filename="../programs/mythfrontend/main.cpp" line="206"/> @@ -97,6 +431,21 @@ </message> <message> <location filename="../programs/mythfrontend/exitprompt.cpp" line="229"/> +@@ -9961,12 +9961,12 @@ + <message> + <location filename="../programs/mythfrontend/videometadatasettings.cpp" line="114"/> + <source>Exit without saving settings</source> +- <translation>Exit without saving settings</translation> ++ <translation>Exit without Saving</translation> + </message> + <message> + <location filename="../programs/mythfrontend/videometadatasettings.cpp" line="115"/> + <source>Save settings and Exit</source> +- <translation>Save settings and Exit</translation> ++ <translation>Save and Exit</translation> + </message> + </context> + <context> @@ -11873,7 +11873,7 @@ <location filename="../libs/libmythtv/mythplayer.cpp" line="4270"/> <location filename="../libs/libmythtv/mythplayer.cpp" line="4306"/> @@ -182,6 +531,21 @@ </message> <message> <location filename="../programs/mythfrontend/playbackbox.cpp" line="2695"/> +@@ -14249,12 +14249,12 @@ + <message> + <location filename="../programs/mythfrontend/videoplayersettings.cpp" line="112"/> + <source>Exit without saving settings</source> +- <translation>Exit without saving settings</translation> ++ <translation>Exit without Saving</translation> + </message> + <message> + <location filename="../programs/mythfrontend/videoplayersettings.cpp" line="113"/> + <source>Save settings and Exit</source> +- <translation>Save settings and Exit</translation> ++ <translation>Save and Exit</translation> + </message> + <message> + <location filename="../programs/mythfrontend/videoplayersettings.cpp" line="170"/> @@ -14340,12 +14340,12 @@ <message> <location filename="../libs/libmythtv/profilegroup.cpp" line="360"/> @@ -251,6 +615,15 @@ </message> <message> <location filename="../libs/libmyth/storagegroupeditor.cpp" line="437"/> +@@ -22695,7 +22695,7 @@ + <location filename="../libs/libmythtv/tv_play.cpp" line="10326"/> + <location filename="../libs/libmythtv/tv_play.cpp" line="11577"/> + <source>Exit Without Saving</source> +- <translation>Exit Without Saving</translation> ++ <translation>Exit without Saving</translation> + </message> + <message> + <location filename="../libs/libmythtv/tv_play.cpp" line="10328"/> @@ -22733,7 +22733,7 @@ <message> <location filename="../libs/libmythtv/tv_play.cpp" line="10903"/> diff --git a/abs/core/mythtv/stable-29/mythweb/PKGBUILD b/abs/core/mythtv/stable-29/mythweb/PKGBUILD index 9cd465e..d294694 100644 --- a/abs/core/mythtv/stable-29/mythweb/PKGBUILD +++ b/abs/core/mythtv/stable-29/mythweb/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mythweb pkgver=29 -pkgrel=1 +pkgrel=2 commit_hash=`cat ../git_src/git_hash_web` pkgdesc="Web interface for MythTV's backend, $commit_hash" arch=('i686' 'x86_64') -- cgit v0.12