Ticket #13286: fixTranslations_v30.patch

mythtv/programs/mythfrontend/audiogeneralsettings.h

@@ -19 +19 @@
 
 class AudioConfigScreen : public StandardSettingDialog
 {
+    Q_OBJECT
+
   public:
     AudioConfigScreen(MythScreenStack *parent, const char *name,
                       GroupSetting *groupSetting);

mythtv/programs/mythfrontend/globalsettings.cpp

@@ -3871 +3871 @@
 PlayBackScaling::PlayBackScaling()
     :GroupSetting()
 {
-    setLabel(tr("Scaling"));
+    setLabel(PlaybackSettings::tr("Scaling"));
     addChild(m_VertScan = VertScanPercentage());
     addChild(m_YScan = YScanDisplacement());
     addChild(m_HorizScan = HorizScanPercentage());
@@ -3894 +3894 @@
         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 +4364 @@
     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,

mythtv/programs/mythfrontend/globalsettings.h

@@ -259 +259 @@
 
 class ChannelGroupSetting : public GroupSetting
 {
+    Q_OBJECT
+
   public:
     ChannelGroupSetting(const QString &groupName, int groupId);
     virtual void Load();

mythtv/programs/mythtv-setup/backendsettings.cpp

@@ -126 +126 @@
      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();

mythtv/i18n/translate.pro

@@ -10 +10 @@
 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

mythtv/libs/libmythtv/tv_play.cpp

@@ -12018 +12018 @@
             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 +12035 @@
         {
             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 +12230 @@
                 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)