Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Miscellaneous string fixes
  • Loading branch information
Nicolas Riendeau committed Mar 4, 2012
1 parent 5e898a1 commit 2422b6f
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 7 deletions.
4 changes: 2 additions & 2 deletions mythtv/libs/libmythtv/videodisplayprofile.cpp
Expand Up @@ -1163,7 +1163,7 @@ QString VideoDisplayProfile::GetVideoRendererHelp(const QString &renderer)
{
msg = QObject::tr(
"This video renderer uses OpenGL for scaling and color conversion "
"with full picture contols. The GPU can be used for deinterlacing. "
"with full picture controls. The GPU can be used for deinterlacing. "
"This requires a faster GPU than XVideo.");
}

Expand Down Expand Up @@ -1350,7 +1350,7 @@ QString VideoDisplayProfile::GetOSDHelp(const QString &osd)
if (osd == "chromakey")
msg = QObject::tr(
"Render the OSD using the XVideo chromakey feature."
"This renderer does not alpha blend. But it is the fastest "
"This renderer does not alpha blend but is the fastest "
"OSD renderer for XVideo.") + "\n" +
QObject::tr(
"Note: nVidia hardware after the 5xxx series does not "
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythtv/videosource.cpp
Expand Up @@ -452,7 +452,7 @@ void XMLTV_generic_config::Save()
VerticalConfigurationGroup::Save();
#if 0
QString err_msg = QObject::tr(
"You MUST run 'mythfilldatabase --manual' the first time,\n "
"You MUST run 'mythfilldatabase --manual' the first time,\n"
"instead of just 'mythfilldatabase'.\nYour grabber does not provide "
"channel numbers, so you have to set them manually.");

Expand Down
6 changes: 2 additions & 4 deletions mythtv/programs/mythfrontend/globalsettings.cpp
Expand Up @@ -2683,10 +2683,8 @@ static HostLineEdit *UDPNotifyPort()
HostLineEdit *ge = new HostLineEdit("UDPNotifyPort");
ge->setLabel(QObject::tr("UDP notify port"));
ge->setValue("6948");
ge->setHelpText(QObject::tr("MythTV will listen for "
"connections from the \"mythtvosd\" or \"mythudprelay\" "
"programs on this port. For additional information, see "
"http://www.mythtv.org/wiki/MythNotify ."));
ge->setHelpText(QObject::tr("MythTV will listen for connections "
"from the \"mythutil\" program on this port."));
return ge;
}

Expand Down

0 comments on commit 2422b6f

Please sign in to comment.