diff --git a/mythtv/programs/mythfrontend/audiogeneralsettings.h b/mythtv/programs/mythfrontend/audiogeneralsettings.h
index 79aa41dd8d..46421a84c2 100644
a
|
b
|
class AudioTest; |
19 | 19 | |
20 | 20 | class AudioConfigScreen : public StandardSettingDialog |
21 | 21 | { |
| 22 | Q_OBJECT |
| 23 | |
22 | 24 | public: |
23 | 25 | AudioConfigScreen(MythScreenStack *parent, const char *name, |
24 | 26 | GroupSetting *groupSetting); |
diff --git a/mythtv/programs/mythfrontend/globalsettings.cpp b/mythtv/programs/mythfrontend/globalsettings.cpp
index 4507619170..0618f9762b 100644
a
|
b
|
class PlayBackScaling : public GroupSetting |
3871 | 3871 | PlayBackScaling::PlayBackScaling() |
3872 | 3872 | :GroupSetting() |
3873 | 3873 | { |
3874 | | setLabel(tr("Scaling")); |
| 3874 | setLabel(PlaybackSettings::tr("Scaling")); |
3875 | 3875 | addChild(m_VertScan = VertScanPercentage()); |
3876 | 3876 | addChild(m_YScan = YScanDisplacement()); |
3877 | 3877 | addChild(m_HorizScan = HorizScanPercentage()); |
… |
… |
void PlayBackScaling::updateButton(MythUIButtonListItem *item) |
3894 | 3894 | m_HorizScan->getValue() == "0" && |
3895 | 3895 | m_YScan->getValue() == "0" && |
3896 | 3896 | m_XScan->getValue() == "0") |
3897 | | item->SetText(tr("No scaling"),"value"); |
| 3897 | item->SetText(PlaybackSettings::tr("No scaling"),"value"); |
3898 | 3898 | else |
3899 | 3899 | item->SetText(QString("%1%x%2%+%3%+%4%") |
3900 | 3900 | .arg(m_HorizScan->getValue()) |
… |
… |
ChannelCheckBoxSetting::ChannelCheckBoxSetting(uint chanid, |
4364 | 4364 | m_channelId(chanid) |
4365 | 4365 | { |
4366 | 4366 | setLabel(QString("%1 %2").arg(channum).arg(channame)); |
4367 | | setHelpText(tr("Select/Unselect channels for this channel group")); |
| 4367 | setHelpText(ChannelGroupSettings::tr("Select/Unselect channels for this channel group")); |
4368 | 4368 | } |
4369 | 4369 | |
4370 | 4370 | ChannelGroupSetting::ChannelGroupSetting(const QString &groupName, |
diff --git a/mythtv/programs/mythfrontend/globalsettings.h b/mythtv/programs/mythfrontend/globalsettings.h
index e069ec1cfb..8c1de7a02e 100644
a
|
b
|
class PlaybackProfileConfig : public GroupSetting |
259 | 259 | |
260 | 260 | class ChannelGroupSetting : public GroupSetting |
261 | 261 | { |
| 262 | Q_OBJECT |
| 263 | |
262 | 264 | public: |
263 | 265 | ChannelGroupSetting(const QString &groupName, int groupId); |
264 | 266 | virtual void Load(); |
diff --git a/mythtv/programs/mythtv-setup/backendsettings.cpp b/mythtv/programs/mythtv-setup/backendsettings.cpp
index 6de0bae49d..bf24cc4f1a 100644
a
|
b
|
class IpAddressSettings : public HostCheckBoxSetting |
126 | 126 | explicit IpAddressSettings(/*Setting* trigger*/) : |
127 | 127 | HostCheckBoxSetting("ListenOnAllIps") |
128 | 128 | { |
129 | | setLabel(QObject::tr("Listen on All IP Addresses")); |
| 129 | setLabel(BackendSettings::tr("Listen on All IP Addresses")); |
130 | 130 | setValue(true); |
131 | | setHelpText(tr("Allow this backend to receive connections on any IP " |
132 | | "Address assigned to it. Recommended for most users " |
133 | | "for ease and reliability.")); |
| 131 | setHelpText(BackendSettings::tr("Allow this backend to receive " |
| 132 | "connections on any IP Address assigned to it. " |
| 133 | "Recommended for most users for ease and " |
| 134 | "reliability.")); |
134 | 135 | |
135 | 136 | localServerIP = LocalServerIP(); |
136 | 137 | localServerIP6 = LocalServerIP6(); |