diff options
4 files changed, 298 insertions, 81 deletions
diff --git a/abs/core/mythtv/stable-29/git_src/git_hash b/abs/core/mythtv/stable-29/git_src/git_hash index be17ab5..d869e90 100644 --- a/abs/core/mythtv/stable-29/git_src/git_hash +++ b/abs/core/mythtv/stable-29/git_src/git_hash @@ -1 +1 @@ -61d331cc0ebb9eccb666b883afcf25c39ed4032b +39b2062c069e801c9f9c4b15d198e8ef72594f55 diff --git a/abs/core/mythtv/stable-29/mythplugins/PKGBUILD b/abs/core/mythtv/stable-29/mythplugins/PKGBUILD index 4f4d3a6..171d9be 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=5 +pkgrel=6 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 f5c1279..5e3047b 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=5 +pkgrel=6 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' - 'a2642932921f646539502a582fffd854' + '2e0ec71d00f0aaf107b0a89c51e55faa' '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 bf6fcf0..1b98065 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 2017-11-20 18:17:17.601771989 +0000 -+++ src/mythtv/i18n/mythfrontend_en_us.ts 2017-11-20 18:18:44.520461442 +0000 +--- src/mythtv/i18n/mythfrontend_en_us.ts.orig 2017-11-29 19:15:53.700048851 +0000 ++++ src/mythtv/i18n/mythfrontend_en_us.ts 2017-11-29 19:15:39.341909739 +0000 @@ -573,7 +573,7 @@ <message> <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="400"/> @@ -403,7 +403,8 @@ - <location filename="../libs/libmythtv/channelsettings.cpp" line="176"/> + <location filename="../libs/libmythtv/channelsettings.cpp" line="178"/> <source>Offset (in minutes) to apply to the program guide data during import. This can be used when the listings for a particular channel are in a different time zone. (Works for DataDirect listings only.)</source> - <translation>Offset (in minutes) to apply to the program guide data during import. This can be used when the listings for a particular channel are in a different time zone. (Works for DataDirect listings only.)</translation> +- <translation>Offset (in minutes) to apply to the program guide data during import. This can be used when the listings for a particular channel are in a different time zone. (Works for DataDirect listings only.)</translation> ++ <translation>Offset (in minutes) to apply to the program guide data during import. This can be used when the listings for a particular channel are in a different time zone. (Works for DataDirect listings only.)</translation> </message> <message> - <location filename="../libs/libmythtv/channelsettings.cpp" line="191"/> @@ -440,7 +441,8 @@ - <location filename="../libs/libmythtv/channelsettings.cpp" line="224"/> + <location filename="../libs/libmythtv/channelsettings.cpp" line="226"/> <source>Filters to be used when recording from this channel. Not used with hardware encoding cards.</source> - <translation>Filters to be used when recording from this channel. Not used with hardware encoding cards.</translation> +- <translation>Filters to be used when recording from this channel. Not used with hardware encoding cards.</translation> ++ <translation>Filters to be used when recording from this channel. Not used with hardware encoding cards.</translation> </message> <message> - <location filename="../libs/libmythtv/channelsettings.cpp" line="238"/> @@ -983,7 +985,7 @@ </message> <message numerus="yes"> <location filename="../programs/mythcommflag/main.cpp" line="1217"/> -@@ -2282,20 +2293,20 @@ +@@ -2282,22 +2293,22 @@ <source>%n commercial break(s)</source> <comment>Job status</comment> <translation> @@ -1006,8 +1008,20 @@ - <location filename="../libs/libmythtv/videosource.cpp" line="1968"/> + <location filename="../libs/libmythtv/videosource.cpp" line="1973"/> <source>Valid DVEO ASI card</source> - <translation>Valid DVEO ASI card</translation> +- <translation>Valid DVEO ASI card</translation> ++ <translation>Valid DVEO ASI Card</translation> </message> + </context> + <context> +@@ -2305,7 +2316,7 @@ + <message> + <location filename="../libs/libmythmetadata/musicmetadata.cpp" line="2019"/> + <source>Scanning for music album art...</source> +- <translation>Scanning for music album art...</translation> ++ <translation>Scanning for Music Album Art...</translation> + </message> + <message> + <location filename="../libs/libmythmetadata/musicmetadata.cpp" line="2146"/> @@ -2340,41 +2351,41 @@ <message> <location filename="../libs/libmythmetadata/musicmetadata.cpp" line="2163"/> @@ -3719,7 +3733,8 @@ - <location filename="../libs/libmyth/dbsettings.cpp" line="96"/> + <location filename="../libs/libmyth/dbsettings.cpp" line="50"/> <source>The port number the database is running on. Leave blank if using the default port (3306).</source> - <translation>The port number the database is running on. Leave blank if using the default port (3306).</translation> +- <translation>The port number the database is running on. Leave blank if using the default port (3306).</translation> ++ <translation>The port number the database is running on. Leave blank if using the default port (3306).</translation> </message> <message> - <location filename="../libs/libmyth/dbsettings.cpp" line="103"/> @@ -7893,7 +7908,8 @@ - <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1585"/> + <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1586"/> <source>You must set a reference number on this rule to set artwork. For items without a metadata source, you can set any unique value.</source> - <translation>You must set a reference number on this rule to set artwork. For items without a metadata source, you can set any unique value.</translation> +- <translation>You must set a reference number on this rule to set artwork. For items without a metadata source, you can set any unique value.</translation> ++ <translation>You must set a reference number on this rule to set artwork. For items without a metadata source, you can set any unique value.</translation> </message> <message> - <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1638"/> @@ -10421,14 +10437,14 @@ <source>Recording pending</source> - <translation>Recording pending</translation> + <translation>Recording Pending</translation> - </message> - <message> -- <location filename="../libs/libmythtv/mythsystemevent.cpp" line="385"/> ++ </message> ++ <message> + <location filename="../libs/libmythtv/mythsystemevent.cpp" line="388"/> + <source>Recording about to fail</source> + <translation>Recording About to Fail</translation> -+ </message> -+ <message> + </message> + <message> +- <location filename="../libs/libmythtv/mythsystemevent.cpp" line="385"/> + <location filename="../libs/libmythtv/mythsystemevent.cpp" line="390"/> <source>Recording failing</source> - <translation>Recording failing</translation> @@ -12269,14 +12285,14 @@ <source>When unchecked the deblocking loopfilter will be disabled </source> - <translation>When unchecked the deblocking loopfilter will be disabled </translation> + <translation>When unchecked the deblocking loopfilter will be disabled.</translation> -+ </message> -+ <message> -+ <location filename="../programs/mythfrontend/globalsettings.cpp" line="881"/> -+ <source>Invalid frame rate specification(%1), discarded</source> -+ <translation>Invalid Frame Rate Specification(%1), Discarded</translation> </message> <message> - <location filename="../programs/mythfrontend/globalsettings.cpp" line="920"/> ++ <location filename="../programs/mythfrontend/globalsettings.cpp" line="881"/> ++ <source>Invalid frame rate specification(%1), discarded</source> ++ <translation>Invalid Frame Rate Specification(%1), Discarded</translation> ++ </message> ++ <message> + <location filename="../programs/mythfrontend/globalsettings.cpp" line="953"/> <source>Main deinterlacing method. %1</source> - <translation>Main deinterlacing method. %1</translation> @@ -13011,12 +13027,10 @@ <extracomment>%1 is the position, %2 is the total</extracomment> - <translation>Commercial Skip (%1/%2)</translation> + <translation type="vanished">Commercial Skip (%1/%2)</translation> - </message> - <message> -- <location filename="../programs/mythfrontend/globalsettings.cpp" line="4035"/> - <source>Mac OS X Video Setting (%1/%2)</source> - <extracomment>%1 is the position, %2 is the total</extracomment> -- <translation>Mac OS X Video Setting (%1/%2)</translation> ++ </message> ++ <message> ++ <source>Mac OS X Video Setting (%1/%2)</source> ++ <extracomment>%1 is the position, %2 is the total</extracomment> + <translation type="vanished">Mac OS X Video Setting (%1/%2)</translation> + </message> + <message> @@ -13036,8 +13050,12 @@ + <location filename="../programs/mythfrontend/globalsettings.cpp" line="3918"/> + <source>Move Up</source> + <translation>Move Up</translation> -+ </message> -+ <message> + </message> + <message> +- <location filename="../programs/mythfrontend/globalsettings.cpp" line="4035"/> +- <source>Mac OS X Video Setting (%1/%2)</source> +- <extracomment>%1 is the position, %2 is the total</extracomment> +- <translation>Mac OS X Video Setting (%1/%2)</translation> + <location filename="../programs/mythfrontend/globalsettings.cpp" line="3920"/> + <source>Move Down</source> + <translation>Move Down</translation> @@ -13053,6 +13071,21 @@ </message> </context> <context> +@@ -14224,12 +14754,12 @@ + <message> + <location filename="../programs/mythfrontend/videoplayersettings.cpp" line="92"/> + <source>This can be any command to launch a DVD player. Internal is the default. For other players, %d will be substituted for the DVD device (e.g. /dev/dvd).</source> +- <translation>This can be any command to launch a DVD player. Internal is the default. For other players, %d will be substituted for the DVD device (e.g. /dev/dvd).</translation> ++ <translation>This can be any command to launch a DVD player. Internal is the default. For other players, %d will be substituted for the DVD device (e.g. /dev/dvd).</translation> + </message> + <message> + <location filename="../programs/mythfrontend/videoplayersettings.cpp" line="96"/> + <source>This device must exist, and the user playing the DVD needs to have read permission on the device. 'default' will let the MediaMonitor choose a device.</source> +- <translation>This device must exist, and the user playing the DVD needs to have read permission on the device. 'default' will let the MediaMonitor choose a device.</translation> ++ <translation>This device must exist, and the user playing the DVD needs to have read permission on the device. 'default' will let the MediaMonitor choose a device.</translation> + </message> + <message> + <location filename="../programs/mythfrontend/videoplayersettings.cpp" line="101"/> @@ -14249,12 +14779,12 @@ <message> <location filename="../programs/mythfrontend/videoplayersettings.cpp" line="112"/> @@ -13076,14 +13109,14 @@ <source>ProfileGroup</source> - <translation>ProfileGroup</translation> + <translation type="vanished">ProfileGroup</translation> -+ </message> -+ <message> -+ <location filename="../libs/libmythtv/profilegroup.cpp" line="47"/> -+ <source>Profile Group</source> -+ <translation>Profile Group</translation> </message> <message> - <location filename="../libs/libmythtv/profilegroup.cpp" line="168"/> ++ <location filename="../libs/libmythtv/profilegroup.cpp" line="47"/> ++ <source>Profile Group</source> ++ <translation>Profile Group</translation> ++ </message> ++ <message> + <location filename="../libs/libmythtv/profilegroup.cpp" line="171"/> + <source>Profiles</source> + <translation>Profiles</translation> @@ -14854,7 +14887,8 @@ - <location filename="../libs/libmyth/mythcontext.cpp" line="1067"/> + <location filename="../libs/libmyth/mythcontext.cpp" line="1387"/> <source>The server uses network protocol version %1, but this client only understands version %2. Make sure you are running compatible versions of the backend and frontend.</source> - <translation>The server uses network protocol version %1, but this client only understands version %2. Make sure you are running compatible versions of the backend and frontend.</translation> +- <translation>The server uses network protocol version %1, but this client only understands version %2. Make sure you are running compatible versions of the backend and frontend.</translation> ++ <translation>The server uses network protocol version %1, but this client only understands version %2. Make sure you are running compatible versions of the backend and frontend.</translation> </message> <message> <location filename="../libs/libmyth/mythdialogs.cpp" line="716"/> @@ -15175,7 +15209,8 @@ - <location filename="../libs/libmythtv/recordingprofile.cpp" line="115"/> + <location filename="../libs/libmythtv/recordingprofile.cpp" line="116"/> <source>Sets the audio sampling rate for your DSP. Ensure that you choose a sampling rate appropriate for your device. btaudio may only allow 32000.</source> - <translation>Sets the audio sampling rate for your DSP. Ensure that you choose a sampling rate appropriate for your device. btaudio may only allow 32000.</translation> +- <translation>Sets the audio sampling rate for your DSP. Ensure that you choose a sampling rate appropriate for your device. btaudio may only allow 32000.</translation> ++ <translation>Sets the audio sampling rate for your DSP. Ensure that you choose a sampling rate appropriate for your device. btaudio may only allow 32000.</translation> </message> <message> - <location filename="../libs/libmythtv/recordingprofile.cpp" line="178"/> @@ -15367,7 +15402,8 @@ - <location filename="../libs/libmythtv/recordingprofile.cpp" line="740"/> + <location filename="../libs/libmythtv/recordingprofile.cpp" line="723"/> <source>If set, the MPEG4 encoder will use '4MV' motion-vector encoding. This requires much more processing, but can result in better video. It is highly recommended that the HQ option is enabled if 4MV is enabled.</source> - <translation>If set, the MPEG4 encoder will use '4MV' motion-vector encoding. This requires much more processing, but can result in better video. It is highly recommended that the HQ option is enabled if 4MV is enabled.</translation> +- <translation>If set, the MPEG4 encoder will use '4MV' motion-vector encoding. This requires much more processing, but can result in better video. It is highly recommended that the HQ option is enabled if 4MV is enabled.</translation> ++ <translation>If set, the MPEG4 encoder will use '4MV' motion-vector encoding. This requires much more processing, but can result in better video. It is highly recommended that the HQ option is enabled if 4MV is enabled.</translation> </message> <message> - <location filename="../libs/libmythtv/recordingprofile.cpp" line="756"/> @@ -15688,7 +15724,8 @@ - <location filename="../libs/libmythtv/recordingprofile.cpp" line="1302"/> + <location filename="../libs/libmythtv/recordingprofile.cpp" line="1256"/> <source>Filters used when transcoding with this profile. This value must be blank to perform lossless transcoding. Format: [[<filter>=<options>,]...]</source> - <translation>Filters used when transcoding with this profile. This value must be blank to perform lossless transcoding. Format: [[<filter>=<options>,]...]</translation> +- <translation>Filters used when transcoding with this profile. This value must be blank to perform lossless transcoding. Format: [[<filter>=<options>,]...]</translation> ++ <translation>Filters used when transcoding with this profile. This value must be blank to perform lossless transcoding. Format: [[<filter>=<options>,]...]</translation> </message> <message> <location filename="../libs/libmyth/settings.cpp" line="805"/> @@ -17000,7 +17037,7 @@ - <location filename="../libs/libmythtv/videosource.cpp" line="568"/> + <location filename="../libs/libmythtv/videosource.cpp" line="142"/> + <source>Maximum number of simultaneous recordings MythTV will attempt using this device. If set to a value other than 1, MythTV can sometimes record multiple programs on the same multiplex or overlapping copies of the same program on a single channel.</source> -+ <translation>Maximum number of simultaneous recordings MythTV will attempt using this device. If set to a value other than 1, MythTV can sometimes record multiple programs on the same multiplex or overlapping copies of the same program on a single channel.</translation> ++ <translation>Maximum number of simultaneous recordings MythTV will attempt using this device. If set to a value other than 1, MythTV can sometimes record multiple programs on the same multiplex or overlapping copies of the same program on a single channel.</translation> + </message> + <message> + <location filename="../libs/libmythtv/videosource.cpp" line="158"/> @@ -17010,7 +17047,7 @@ + <message> + <location filename="../libs/libmythtv/videosource.cpp" line="161"/> + <source>Schedule all virtual inputs on this device as a group. This is more efficient than scheduling each input individually, but can result in scheduling more simultaneous recordings than is allowed. Be sure to set the maximum number of simultaneous recordings above high enough to handle all expected cases.</source> -+ <translation>Schedule all virtual inputs on this device as a group. This is more efficient than scheduling each input individually, but can result in scheduling more simultaneous recordings than is allowed. Be sure to set the maximum number of simultaneous recordings above high enough to handle all expected cases.</translation> ++ <translation>Schedule all virtual inputs on this device as a group. This is more efficient than scheduling each input individually, but can result in scheduling more simultaneous recordings than is allowed. Be sure to set the maximum number of simultaneous recordings above high enough to handle all expected cases.</translation> + </message> + <message> + <location filename="../libs/libmythtv/videosource.cpp" line="246"/> @@ -17109,7 +17146,7 @@ + <location filename="../libs/libmythtv/videosource.cpp" line="1168"/> <source>Wait for SEQ start header.</source> - <translation>Wait for SEQ start header.</translation> -+ <translation>Wait for Seq Start Header</translation> ++ <translation>Wait for SEQ Start Header</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="1142"/> @@ -17462,7 +17499,8 @@ - <location filename="../libs/libmythtv/videosource.cpp" line="3367"/> + <location filename="../libs/libmythtv/videosource.cpp" line="3286"/> <source>If priorities and other factors are equal the scheduler will choose the available input with the lowest, non-zero value. Setting this value to zero will make the input unavailable to the scheduler.</source> - <translation>If priorities and other factors are equal the scheduler will choose the available input with the lowest, non-zero value. Setting this value to zero will make the input unavailable to the scheduler.</translation> +- <translation>If priorities and other factors are equal the scheduler will choose the available input with the lowest, non-zero value. Setting this value to zero will make the input unavailable to the scheduler.</translation> ++ <translation>If priorities and other factors are equal the scheduler will choose the available input with the lowest, non-zero value. Setting this value to zero will make the input unavailable to the scheduler.</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="3382"/> @@ -17475,7 +17513,8 @@ - <location filename="../libs/libmythtv/videosource.cpp" line="3384"/> + <location filename="../libs/libmythtv/videosource.cpp" line="3303"/> <source>When entering Live TV, the available, local input with the lowest, non-zero value will be used. If no local inputs are available, the available, remote input with the lowest, non-zero value will be used. Setting this value to zero will make the input unavailable to live TV.</source> - <translation>When entering Live TV, the available, local input with the lowest, non-zero value will be used. If no local inputs are available, the available, remote input with the lowest, non-zero value will be used. Setting this value to zero will make the input unavailable to live TV.</translation> +- <translation>When entering Live TV, the available, local input with the lowest, non-zero value will be used. If no local inputs are available, the available, remote input with the lowest, non-zero value will be used. Setting this value to zero will make the input unavailable to live TV.</translation> ++ <translation>When entering Live TV, the available, local input with the lowest, non-zero value will be used. If no local inputs are available, the available, remote input with the lowest, non-zero value will be used. Setting this value to zero will make the input unavailable to live TV.</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="3404"/> @@ -17616,7 +17655,8 @@ - <location filename="../libs/libmythtv/videosource.cpp" line="988"/> + <location filename="../libs/libmythtv/videosource.cpp" line="1029"/> <source>Maximum time (in milliseconds) MythTV waits for a channel lock. For recordings, if this time is exceeded, the recording will be marked as failed.</source> - <translation>Maximum time (in milliseconds) MythTV waits for a channel lock. For recordings, if this time is exceeded, the recording will be marked as failed.</translation> +- <translation>Maximum time (in milliseconds) MythTV waits for a channel lock. For recordings, if this time is exceeded, the recording will be marked as failed.</translation> ++ <translation>Maximum time (in milliseconds) MythTV waits for a channel lock. For recordings, if this time is exceeded, the recording will be marked as failed.</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="1002"/> @@ -17629,7 +17669,8 @@ - <location filename="../libs/libmythtv/videosource.cpp" line="1004"/> + <location filename="../libs/libmythtv/videosource.cpp" line="1044"/> <source>If non-zero, override the audio sampling rate in the recording profile when this card is used. Use this if your capture card does not support all of the standard rates.</source> - <translation>If non-zero, override the audio sampling rate in the recording profile when this card is used. Use this if your capture card does not support all of the standard rates.</translation> +- <translation>If non-zero, override the audio sampling rate in the recording profile when this card is used. Use this if your capture card does not support all of the standard rates.</translation> ++ <translation>If non-zero, override the audio sampling rate in the recording profile when this card is used. Use this if your capture card does not support all of the standard rates.</translation> </message> <message> - <location filename="../libs/libmythtv/videosource.cpp" line="1130"/> @@ -17853,7 +17894,7 @@ <source>This is updated on every successful channel change.</source> <translation>This is updated on every successful channel change.</translation> </message> -@@ -19082,46 +19592,46 @@ +@@ -19082,48 +19592,48 @@ <translation>The following programs will be recorded instead:</translation> </message> <message> @@ -17909,8 +17950,11 @@ - <location filename="../programs/mythfilldatabase/main.cpp" line="359"/> + <location filename="../programs/mythfilldatabase/main.cpp" line="361"/> <source>mythfilldatabase ran, but did not insert any new data into the Guide. This can indicate a potential problem with the XML file used for the update.</source> - <translation>mythfilldatabase ran, but did not insert any new data into the Guide. This can indicate a potential problem with the XML file used for the update.</translation> +- <translation>mythfilldatabase ran, but did not insert any new data into the Guide. This can indicate a potential problem with the XML file used for the update.</translation> ++ <translation>mythfilldatabase ran, but did not insert any new data into the Guide. This can indicate a potential problem with the XML file used for the update.</translation> </message> + <message> + <location filename="../programs/mythfrontend/setupwizard_audio.cpp" line="295"/> @@ -19136,24 +19646,23 @@ <translation>Audio device is invalid or not useable.</translation> </message> @@ -18231,7 +18275,8 @@ - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="685"/> + <location filename="../programs/mythtv-setup/backendsettings.cpp" line="757"/> <source>If enabled, the master backend will include the list of recorded shows in the list of videos. This is mainly to accommodate UPnP players which do not allow more than 1 video section.</source> - <translation>If enabled, the master backend will include the list of recorded shows in the list of videos. This is mainly to accommodate UPnP players which do not allow more than 1 video section.</translation> +- <translation>If enabled, the master backend will include the list of recorded shows in the list of videos. This is mainly to accommodate UPnP players which do not allow more than 1 video section.</translation> ++ <translation>If enabled, the master backend will include the list of recorded shows in the list of videos. This is mainly to accommodate UPnP players which do not allow more than 1 video section.</translation> </message> <message> - <location filename="../programs/mythtv-setup/backendsettings.cpp" line="697"/> @@ -18815,17 +18860,24 @@ <source>Host Address Backend Setup</source> - <translation>Host Address Backend Setup</translation> + <translation type="vanished">Host Address Backend Setup</translation> -+ </message> -+ <message> -+ <source>Local Backend</source> + </message> + <message> +- <location filename="../programs/mythtv-setup/backendsettings.cpp" line="806"/> + <source>Local Backend</source> +- <translation>Local Backend</translation> + <translation type="vanished">Local Backend</translation> -+ </message> -+ <message> + </message> + <message> +- <location filename="../programs/mythtv-setup/backendsettings.cpp" line="830"/> +- <location filename="../programs/mythtv-setup/backendsettings.cpp" line="894"/> + <location filename="../programs/mythtv-setup/backendsettings.cpp" line="963"/> -+ <source>Master Backend</source> -+ <translation>Master Backend</translation> -+ </message> -+ <message> + <source>Master Backend</source> + <translation>Master Backend</translation> + </message> + <message> +- <location filename="../programs/mythtv-setup/backendsettings.cpp" line="841"/> +- <source>Locale Settings</source> +- <translation>Locale Settings</translation> + <location filename="../programs/mythtv-setup/backendsettings.cpp" line="913"/> + <source>Locale Settings</source> + <translation>Locale Settings</translation> @@ -18849,28 +18901,18 @@ + <location filename="../programs/mythtv-setup/backendsettings.cpp" line="33"/> + <source>Host name of Master Backend. This is set by selecting "This server is the Master Backend" on that server.</source> + <translation>Host name of master backend. This is set by selecting "This server is the master backend" on that server.</translation> - </message> - <message> -- <location filename="../programs/mythtv-setup/backendsettings.cpp" line="806"/> -- <source>Local Backend</source> -- <translation>Local Backend</translation> ++ </message> ++ <message> + <location filename="../programs/mythtv-setup/backendsettings.cpp" line="42"/> + <source>Allow Connections from all Subnets</source> + <translation>Allow Connections from All Subnets</translation> - </message> - <message> -- <location filename="../programs/mythtv-setup/backendsettings.cpp" line="830"/> -- <location filename="../programs/mythtv-setup/backendsettings.cpp" line="894"/> -- <source>Master Backend</source> -- <translation>Master Backend</translation> ++ </message> ++ <message> + <location filename="../programs/mythtv-setup/backendsettings.cpp" line="44"/> + <source>Allow this backend to receive connections from any IP address on the internet. NOT recommended for most users. Use this only if you have secure IPV4 and IPV6 firewalls.</source> + <translation>Allow this backend to receive connections from any IP address on the internet. NOT recommended for most users. Use this only if you have secure IPV4 and IPV6 firewalls.</translation> - </message> - <message> -- <location filename="../programs/mythtv-setup/backendsettings.cpp" line="841"/> -- <source>Locale Settings</source> -- <translation>Locale Settings</translation> ++ </message> ++ <message> + <location filename="../programs/mythtv-setup/backendsettings.cpp" line="76"/> + <source>Listen on IPv6 address</source> + <translation>Listen on IPv6 Address</translation> @@ -19960,16 +20002,16 @@ <source>The following programs will be recorded instead:</source> - <translation>The following programs will be recorded instead:</translation> + <translation>Tthe Following Programs Will Be Recorded Instead:</translation> ++ </message> ++ <message> ++ <location filename="../programs/mythfrontend/schedulecommon.cpp" line="335"/> ++ <source>Watch This Channel</source> ++ <translation>Watch This Channel</translation> </message> <message> - <location filename="../programs/mythfrontend/schedulecommon.cpp" line="329"/> - <location filename="../programs/mythfrontend/schedulecommon.cpp" line="381"/> - <location filename="../programs/mythfrontend/schedulecommon.cpp" line="471"/> -+ <location filename="../programs/mythfrontend/schedulecommon.cpp" line="335"/> -+ <source>Watch This Channel</source> -+ <translation>Watch This Channel</translation> -+ </message> -+ <message> + <location filename="../programs/mythfrontend/schedulecommon.cpp" line="340"/> + <location filename="../programs/mythfrontend/schedulecommon.cpp" line="394"/> + <location filename="../programs/mythfrontend/schedulecommon.cpp" line="484"/> @@ -20206,6 +20248,15 @@ <source>Default</source> <translation>Default</translation> </message> +@@ -21251,7 +21824,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> +- <translation>Error: This version of Myth%1 requires MySQL %2.%3.%4 or later. You seem to be running MySQL version %5.</translation> ++ <translation>Error: This version of Myth%1 requires MySQL %2.%3.%4 or later. You seem to be running MySQL version %5.</translation> + </message> + <message> + <location filename="../libs/libmyth/schemawizard.cpp" line="317"/> @@ -21316,7 +21889,7 @@ <message> <location filename="../libs/libmyth/schemawizard.cpp" line="402"/> @@ -22548,7 +22599,8 @@ - <location filename="../libs/libmythtv/tv_play.cpp" line="12942"/> + <location filename="../libs/libmythtv/tv_play.cpp" line="12873"/> <source>MythTV is already using all available inputs for the channel you selected. If you want to watch an in-progress recording, select one from the playback menu. If you want to watch Live TV, cancel one of the in-progress recordings from the delete menu.</source> - <translation>MythTV is already using all available inputs for the channel you selected. If you want to watch an in-progress recording, select one from the playback menu. If you want to watch Live TV, cancel one of the in-progress recordings from the delete menu.</translation> +- <translation>MythTV is already using all available inputs for the channel you selected. If you want to watch an in-progress recording, select one from the playback menu. If you want to watch Live TV, cancel one of the in-progress recordings from the delete menu.</translation> ++ <translation>MythTV is already using all available inputs for the channel you selected. If you want to watch an in-progress recording, select one from the playback menu. If you want to watch Live TV, cancel one of the in-progress recordings from the delete menu.</translation> </message> <message> - <location filename="../libs/libmythtv/tv_play.cpp" line="12506"/> @@ -22986,6 +23038,24 @@ <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 +24618,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> +- <translation>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.</translation> ++ <translation>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.</translation> + </message> + <message> + <location filename="../themes/themestrings.h" line="851"/> +@@ -24130,7 +24772,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> +- <translation>Below you will find the program details of the selected item. There are two available screens. You can toggle between them by pressing INFO.</translation> ++ <translation>Below you will find the program details of the selected item. There are two available screens. You can toggle between them by pressing INFO.</translation> + </message> + <message> + <location filename="../themes/themestrings.h" line="866"/> @@ -24317,7 +24959,7 @@ <message> <location filename="../themes/themestrings.h" line="890"/> @@ -22995,6 +23065,15 @@ </message> <message> <location filename="../themes/themestrings.h" line="891"/> +@@ -24397,7 +25039,7 @@ + <message> + <location filename="../themes/themestrings.h" line="908"/> + <source>Type your tweet below. Select "Send" to submit it.</source> +- <translation>Type your tweet below. Select "Send" to submit it.</translation> ++ <translation>Type your tweet below. Select "Send" to submit it.</translation> + </message> + <message> + <location filename="../themes/themestrings.h" line="909"/> @@ -24452,7 +25094,7 @@ <message> <location filename="../themes/themestrings.h" line="390"/> @@ -23004,6 +23083,42 @@ </message> <message> <location filename="../themes/themestrings.h" line="954"/> +@@ -24604,7 +25246,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> +- <translation>Graphite is a theme emphasizing MythUI interface improvements such as alpha, animation, unique layouts, and user-supplied backdrop content. It is extremely memory-hungry.</translation> ++ <translation>Graphite is a theme emphasizing MythUI interface improvements such as alpha, animation, unique layouts, and user-supplied backdrop content. It is extremely memory-hungry.</translation> + </message> + <message> + <location filename="../themes/themestrings.h" line="1011"/> +@@ -25307,7 +25949,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> +- <translation>Press Up/Down from letter list, to navigate to another list. Press Left/Right from Show or Episode list to navigate to another list.</translation> ++ <translation>Press Up/Down from letter list, to navigate to another list. Press Left/Right from Show or Episode list to navigate to another list.</translation> + </message> + <message> + <location filename="../themes/themestrings.h" line="1083"/> +@@ -25332,7 +25974,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> +- <translation>No videos in library, or no files found. If you have configured a video directory, press MENU and select "Scan for Changes."</translation> ++ <translation>No videos in library, or no files found. If you have configured a video directory, press MENU and select "Scan for Changes."</translation> + </message> + <message> + <location filename="../themes/themestrings.h" line="745"/> +@@ -25376,7 +26018,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> +- <translation>Designed to show off some different element arrangements. Reminder: On Watch Recordings screen [Rew] and [FF] can be used to change the Rec. Group.</translation> ++ <translation>Designed to show off some different element arrangements. Reminder: On Watch Recordings screen [Rew] and [FF] can be used to change the Rec. Group.</translation> + </message> + <message> + <location filename="../themes/themestrings.h" line="1123"/> @@ -25627,7 +26269,7 @@ <message> <location filename="../themes/themestrings.h" line="1172"/> @@ -23013,6 +23128,15 @@ </message> <message> <location filename="../themes/themestrings.h" line="1173"/> +@@ -25860,7 +26502,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> +- <translation>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.</translation> ++ <translation>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.</translation> + </message> + <message> + <location filename="../themes/themestrings.h" line="417"/> @@ -26303,7 +26945,7 @@ <message> <location filename="../themes/themestrings.h" line="638"/> @@ -23031,6 +23155,42 @@ </message> <message> <location filename="../themes/themestrings.h" line="666"/> +@@ -26618,7 +27260,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> +- <translation>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.</translation> ++ <translation>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.</translation> + </message> + <message> + <location filename="../themes/themestrings.h" line="708"/> +@@ -26902,7 +27544,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> +- <translation>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!</translation> ++ <translation>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!</translation> + </message> + <message> + <location filename="../themes/themestrings.h" line="803"/> +@@ -27454,7 +28096,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> +- <translation>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.</translation> ++ <translation>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.</translation> + </message> + <message> + <location filename="../themes/themestrings.h" line="1107"/> +@@ -28434,7 +29076,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> +- <translation>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."</translation> ++ <translation>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."</translation> + </message> + <message> + <location filename="../themes/themestrings.h" line="303"/> @@ -28564,7 +29206,7 @@ <message> <location filename="../themes/themestrings.h" line="478"/> @@ -23040,6 +23200,57 @@ </message> <message> <location filename="../themes/themestrings.h" line="279"/> +@@ -28851,9 +29493,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> +- <translation>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. ++ <translation>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.</translation> ++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.</translation> + </message> + <message> + <location filename="../themes/themestrings.h" line="922"/> +@@ -29298,7 +29940,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> +- <translation>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.</translation> ++ <translation>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.</translation> + </message> + <message> + <location filename="../themes/themestrings.h" line="160"/> +@@ -29674,12 +30316,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> +- <translation>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.</translation> ++ <translation>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.</translation> + </message> + <message> + <location filename="../themes/themestrings.h" line="971"/> + <source>Childish is the first MythTV theme designed specifically with children in mind. It was the winner of MythTV's v0.23 theming contest.</source> +- <translation>Childish is the first MythTV theme designed specifically with children in mind. It was the winner of MythTV's v0.23 theming contest.</translation> ++ <translation>Childish is the first MythTV theme designed specifically with children in mind. It was the winner of MythTV's v0.23 theming contest.</translation> + </message> + <message> + <location filename="../themes/themestrings.h" line="20"/> +@@ -29699,12 +30341,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> +- <translation>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.</translation> ++ <translation>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.</translation> + </message> + <message> + <location filename="../themes/themestrings.h" line="391"/> + <source>This was adapted from the Jeroen Brosens' MythCenter theme. The fonts have been changed to freely redistributable ones and layout changes have been made to make this theme look good on 1280x720 and 1920x1080 screens with a 1:1 pixel aspect ratio.</source> +- <translation>This was adapted from the Jeroen Brosens' MythCenter theme. The fonts have been changed to freely redistributable ones and layout changes have been made to make this theme look good on 1280x720 and 1920x1080 screens with a 1:1 pixel aspect ratio.</translation> ++ <translation>This was adapted from the Jeroen Brosens' MythCenter theme. The fonts have been changed to freely redistributable ones and layout changes have been made to make this theme look good on 1280x720 and 1920x1080 screens with a 1:1 pixel aspect ratio.</translation> + </message> + <message> + <location filename="../themes/themestrings.h" line="394"/> @@ -29954,7 +30596,7 @@ <context> <name>ThemeUpdateChecker</name> @@ -23678,7 +23889,13 @@ </message> </context> <context> -@@ -31217,12 +31862,12 @@ +@@ -31212,17 +31857,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> +- <translation>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.</translation> ++ <translation>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.</translation> + </message> <message> <location filename="../programs/mythfrontend/setupwizard_video.cpp" line="75"/> <source>Test your playback settings with Standard Definition content. (480p)</source> |