mythtv & mythplugins: update to latest fixes

mythtv: move string changes to en_us translation so as not to affect other languages

1 files changed, 5 insertions, 53 deletions

diff --git a/abs/core/mythtv/stable-0.28/mythtv/autoskip_reduce_commskip_jumpback.patch b/abs/core/mythtv/stable-0.28/mythtv/autoskip_reduce_commskip_jumpback.patch
index b1c90ed..b6815ef 100644
--- a/abs/core/mythtv/stable-0.28/mythtv/autoskip_reduce_commskip_jumpback.patch
+++ b/abs/core/mythtv/stable-0.28/mythtv/autoskip_reduce_commskip_jumpback.patch
@@ -1,61 +1,13 @@
---- src/mythtv/libs/libmythtv/commbreakmap.cpp	2016-04-08 13:35:22.657983969 +0000
-+++ src/mythtv/libs/libmythtv/commbreakmap.cpp	2016-04-13 21:42:51.461959071 +0000
-@@ -233,7 +233,7 @@
-     if (kCommSkipOn == autocommercialskip)
+--- src/mythtv/libs/libmythtv/commbreakmap.cpp.orig	2017-03-15 20:34:21.722746111 +0000
++++ src/mythtv/libs/libmythtv/commbreakmap.cpp	2017-03-15 20:35:21.531732684 +0000
+@@ -271,8 +271,8 @@
      {
-         //: %1 is the skip time
--        comm_msg = tr("Skip %1").arg(skipTime);
-+        comm_msg = tr("Skip Commercial: %1").arg(skipTime);
-     }
-     else
-     {
-@@ -269,10 +269,9 @@
-     if ((skipcommercials == (0 - lastCommSkipDirection)) &&
-         ((time(NULL) - lastCommSkipTime) <= 5))
-     {
--        comm_msg = tr("Skipping Back.");
--
+         comm_msg = tr("Skipping Back.");
+ 
 -        if (lastCommSkipStart > (2.0 * video_frame_rate))
 -            lastCommSkipStart -= (long long) (2.0 * video_frame_rate);
-+        comm_msg = tr("Skipping Back");
 +        if (lastCommSkipStart > (video_frame_rate))
 +            lastCommSkipStart -= (long) (video_frame_rate);
          lastCommSkipDirection = 0;
          lastCommSkipTime = time(NULL);
          jumpToFrame = lastCommSkipStart;
-@@ -287,7 +286,7 @@
-     if ((commBreakIter == commBreakMap.begin()) &&
-         (skipcommercials < 0))
-     {
--        comm_msg = tr("Start of program.");
-+        comm_msg = tr("Start of Program");
-         jumpToFrame = 0;
-         return true;
-     }
-@@ -297,7 +296,7 @@
-          ((totalFrames) &&
-           ((commBreakIter.key() + (10 * video_frame_rate)) > totalFrames))))
-     {
--        comm_msg = tr("At End, cannot Skip.");
-+        comm_msg = tr("At End, Cannot Skip");
-         return false;
-     }
- 
-@@ -313,7 +312,7 @@
-         {
-             if (commBreakIter == commBreakMap.begin())
-             {
--                comm_msg = tr("Start of program.");
-+                comm_msg = tr("Start of Program");
-                 jumpToFrame = 0;
-                 return true;
-             }
-@@ -341,7 +340,7 @@
-                  ((commBreakIter.key() + (10 * video_frame_rate)) >
-                                                                 totalFrames)))
-             {
--                comm_msg = tr("At End, cannot Skip.");
-+                comm_msg = tr("At End, Cannot Skip");
-                 return false;
-             }
-         }