Ticket #8432: channelscan_tr.diff

i18n/translate.pro

@@ -5 +5 @@
 SOURCES += ../libs/libmythtv/*.cpp
 SOURCES += ../libs/libmythtv/*.h
 SOURCES += ../libs/libmythtv/channelscan/*.cpp
+SOURCES += ../libs/libmythtv/channelscan/*.h
 SOURCES += ../libs/libmythtv/iptv/*.cpp
 SOURCES += ../libs/libmythtv/mpeg/*.cpp
 SOURCES += ../libs/libmythui/*.cpp

libs/libmythtv/channelscan/paneexistingscanimport.h

@@ -44 +44 @@
         VerticalConfigurationGroup(false,false,true,false),
         sourceid(0), scanSelect(new TransComboBoxSetting())
     {
-        scanSelect->setLabel(tr("Scan to Import"));
+        scanSelect->setLabel(QObject::tr("Scan to Import"));
         addChild(scanSelect);
     }
 

libs/libmythtv/channelscan/frequencytablesetting.cpp

@@ -81 +81 @@
     else if (qtcountry == QLocale::Denmark)
         country = "da";
 
-    setLabel(tr("Country"));
+    setLabel(QObject::tr("Country"));
     addSelection(QObject::tr("Australia"),      "au", country == "au");
     addSelection(QObject::tr("Czech Republic"), "cz", country == "cz");
     addSelection(QObject::tr("Denmark"),        "da", country == "da");
@@ -106 +106 @@
     else if (qtcountry == QLocale::UnitedKingdom)
         country = "uk";
 
-    setLabel(tr("Country"));
+    setLabel(QObject::tr("Country"));
     addSelection(QObject::tr("Germany"),        "de", country == "de");
     addSelection(QObject::tr("United Kingdom"), "uk", country == "uk");
 }

libs/libmythtv/channelscan/channelscanmiscsettings.h

@@ -87 +87 @@
                         "TV+Radio - Adds all services with audio, "
                         "All - Adds all services "
                         "(including data only serices)."));
-        addSelection(tr("TV"),       "tv", true);
-        addSelection(tr("TV+Radio"), "audio");
-        addSelection(tr("All"),      "all");
+        addSelection(QObject::tr("TV"),       "tv", true);
+        addSelection(QObject::tr("TV+Radio"), "audio");
+        addSelection(QObject::tr("All"),      "all");
     };
 
     ServiceRequirements GetServiceRequirements(void) const