summaryrefslogtreecommitdiffstats
path: root/abs/core/mythtv/stable-30/mythtv/fixTranslations.patch
blob: ba2c4fe14a1e50ca82b9d41f327aef38fde82aee (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
diff --git a/mythtv/programs/mythfrontend/audiogeneralsettings.h b/mythtv/programs/mythfrontend/audiogeneralsettings.h
index 79aa41dd8d..46421a84c2 100644
--- a/mythtv/programs/mythfrontend/audiogeneralsettings.h
+++ b/mythtv/programs/mythfrontend/audiogeneralsettings.h
@@ -19,6 +19,8 @@ class AudioTest;
 
 class AudioConfigScreen : public StandardSettingDialog
 {
+    Q_OBJECT
+
   public:
     AudioConfigScreen(MythScreenStack *parent, const char *name,
                       GroupSetting *groupSetting);
diff --git a/mythtv/programs/mythfrontend/globalsettings.cpp b/mythtv/programs/mythfrontend/globalsettings.cpp
index 4507619170..0618f9762b 100644
--- a/mythtv/programs/mythfrontend/globalsettings.cpp
+++ b/mythtv/programs/mythfrontend/globalsettings.cpp
@@ -3871,7 +3871,7 @@ class PlayBackScaling : public GroupSetting
 PlayBackScaling::PlayBackScaling()
     :GroupSetting()
 {
-    setLabel(tr("Scaling"));
+    setLabel(PlaybackSettings::tr("Scaling"));
     addChild(m_VertScan = VertScanPercentage());
     addChild(m_YScan = YScanDisplacement());
     addChild(m_HorizScan = HorizScanPercentage());
@@ -3894,7 +3894,7 @@ void PlayBackScaling::updateButton(MythUIButtonListItem *item)
         m_HorizScan->getValue() == "0" &&
         m_YScan->getValue() == "0" &&
         m_XScan->getValue() == "0")
-        item->SetText(tr("No scaling"),"value");
+        item->SetText(PlaybackSettings::tr("No scaling"),"value");
     else
         item->SetText(QString("%1%x%2%+%3%+%4%")
                 .arg(m_HorizScan->getValue())
@@ -4364,7 +4364,7 @@ ChannelCheckBoxSetting::ChannelCheckBoxSetting(uint chanid,
     m_channelId(chanid)
 {
     setLabel(QString("%1 %2").arg(channum).arg(channame));
-    setHelpText(tr("Select/Unselect channels for this channel group"));
+    setHelpText(ChannelGroupSettings::tr("Select/Unselect channels for this channel group"));
 }
 
 ChannelGroupSetting::ChannelGroupSetting(const QString &groupName,
diff --git a/mythtv/programs/mythfrontend/globalsettings.h b/mythtv/programs/mythfrontend/globalsettings.h
index e069ec1cfb..8c1de7a02e 100644
--- a/mythtv/programs/mythfrontend/globalsettings.h
+++ b/mythtv/programs/mythfrontend/globalsettings.h
@@ -259,6 +259,8 @@ class PlaybackProfileConfig : public GroupSetting
 
 class ChannelGroupSetting : public GroupSetting
 {
+    Q_OBJECT
+
   public:
     ChannelGroupSetting(const QString &groupName, int groupId);
     virtual void Load();
diff --git a/mythtv/programs/mythtv-setup/backendsettings.cpp b/mythtv/programs/mythtv-setup/backendsettings.cpp
index 6de0bae49d..bf24cc4f1a 100644
--- a/mythtv/programs/mythtv-setup/backendsettings.cpp
+++ b/mythtv/programs/mythtv-setup/backendsettings.cpp
@@ -126,11 +126,12 @@ class IpAddressSettings : public HostCheckBoxSetting
      explicit IpAddressSettings(/*Setting* trigger*/) :
          HostCheckBoxSetting("ListenOnAllIps")
      {
-         setLabel(QObject::tr("Listen on All IP Addresses"));
+         setLabel(BackendSettings::tr("Listen on All IP Addresses"));
          setValue(true);
-         setHelpText(tr("Allow this backend to receive connections on any IP "
-                        "Address assigned to it. Recommended for most users "
-                        "for ease and reliability."));
+         setHelpText(BackendSettings::tr("Allow this backend to receive "
+                        "connections on any IP Address assigned to it. "
+                        "Recommended for most users for ease and "
+                        "reliability."));
 
          localServerIP = LocalServerIP();
          localServerIP6 = LocalServerIP6();
diff --git a/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/mythtv/libs/libmythtv/tv_play.cpp b/mythtv/libs/libmythtv/tv_play.cpp
index ea0aa806d5..710650dc95 100644
--- a/mythtv/libs/libmythtv/tv_play.cpp
+++ b/mythtv/libs/libmythtv/tv_play.cpp
@@ -12018,7 +12018,7 @@ bool TV::MenuItemDisplayPlayback(const MenuItemContext &c)
             if (m_tvm_canupmix)
             {
                 active = m_tvm_upmixing;
-                BUTTON(actionName, tr("Auto Detect"));
+                BUTTON(actionName, tr("Enable Audio Upmixer"));
             }
         }
         else if (actionName == "AUTODETECT_FILL")
@@ -12035,6 +12035,14 @@ bool TV::MenuItemDisplayPlayback(const MenuItemContext &c)
         {
             BUTTON(actionName, tr("Manual Zoom Mode"));
         }
+        else if (actionName == "BOTTOMLINEMOVE")
+        {
+            BUTTON(actionName, tr("Move BottomLine off screen"));
+        }
+        else if (actionName == "BOTTOMLINESAVE")
+        {
+            BUTTON(actionName, tr("Save manual zoom for BottomLine"));
+        }
         else if (actionName == "TOGGLENIGHTMODE")
         {
             if (m_tvm_sup != kPictureAttributeSupported_None)
@@ -12222,6 +12230,10 @@ bool TV::MenuItemDisplayPlayback(const MenuItemContext &c)
                 BUTTON2(actionName, tr("DVD Root Menu"), tr("Top menu"));
             }
         }
+        else if (actionName == "JUMPBKMRK")
+        {
+            BUTTON(actionName, tr("Jump to bookmark"));
+        }
         else if (actionName == "JUMPTOPOPUPMENU")
         {
             if (m_tvm_isbd)