Index: /usr/src/mythtv-trunk/mythtv/themes/themestrings.h
===================================================================
--- /usr/src/mythtv-trunk/mythtv/themes/themestrings.h	(revision 24387)
+++ /usr/src/mythtv-trunk/mythtv/themes/themestrings.h	(working copy)
@@ -178,15 +178,15 @@
     ThemeUI::tr("Welcome to MythTV");
     ThemeUI::tr("MythTV is idle and will shut down shortly.");
     ThemeUI::tr("Current Recording(s):");
-    ThemeUI::tr("Retrieving Recording Status ...");
+    ThemeUI::tr("Retrieving Recording Status...");
     ThemeUI::tr("Next Scheduled Recording(s):");
-    ThemeUI::tr("Retrieving Scheduled Recordings ...");
+    ThemeUI::tr("Retrieving Scheduled Recordings...");
     ThemeUI::tr("WARNING: There are conflicting scheduled recordings!");
     ThemeUI::tr("Move the selected arrow to the corner of the TV screen.  Press SELECT to edit the other arrow.  Press MENU for options and ESC to quit.");
     ThemeUI::tr("1280 x 720");
     ThemeUI::tr("0 x 0");
     ThemeUI::tr("Filename");
-    ThemeUI::tr("Please Wait....");
+    ThemeUI::tr("Please Wait...");
     ThemeUI::tr("Select an Icon");
     ThemeUI::tr("Icon Download Status...");
     ThemeUI::tr("Search terms:");
@@ -274,9 +274,9 @@
     ThemeUI::tr("title goes here");
     ThemeUI::tr("sep 13, 2004 11:00 pm (1h 15m)");
     ThemeUI::tr("description goes here.");
-    ThemeUI::tr("x.xx Gb");
-    ThemeUI::tr("xxxxx mb");
-    ThemeUI::tr("0 mb");
+    ThemeUI::tr("x.xx GB");
+    ThemeUI::tr("xxxxx MB");
+    ThemeUI::tr("0 MB");
     ThemeUI::tr("File Finder To Import");
     ThemeUI::tr("Watch Recordings");
     ThemeUI::tr("%|\"SUBTITLE|\"% %STARS% %DESCRIPTION%");
@@ -309,7 +309,7 @@
     ThemeUI::tr("Post Processing Editor");
     ThemeUI::tr("Run User job #2");
     ThemeUI::tr("Details");
-    ThemeUI::tr("Mythbuntu is based off of ProjectGrayhem, a dark, shiny theme originally inspired by XBMC's ProjectMayhem skin");
+    ThemeUI::tr("Mythbuntu is based on ProjectGrayhem - a dark, shiny theme originally inspired by XBMC's ProjectMayhem skin");
     ThemeUI::tr("MythTV is idle and will shutdown shortly.");
     ThemeUI::tr("Current Recording(s)");
     ThemeUI::tr("Next Scheduled Recording(s)");
@@ -560,7 +560,7 @@
     ThemeUI::tr("Sample Clauses:");
     ThemeUI::tr(" This was adapted from the Jeroen Brosens' MythCenter theme. The fonts have been changed to freely redistributable ones and layout changes have been made to make this theme look good on 1280x720 and 1920x1080 screens with a 1:1 pixel aspect ratio. ");
     ThemeUI::tr("Heading");
-    ThemeUI::tr("Playback starting …");
+    ThemeUI::tr("Playback starting...");
     ThemeUI::tr("Bookmark Manager");
     ThemeUI::tr("Web Page");
     ThemeUI::tr("Icon Importer");
Index: /usr/src/mythtv-trunk/mythtv/libs/libmythtv/playgroup.cpp
===================================================================
--- /usr/src/mythtv-trunk/mythtv/libs/libmythtv/playgroup.cpp	(revision 24387)
+++ /usr/src/mythtv-trunk/mythtv/libs/libmythtv/playgroup.cpp	(working copy)
@@ -80,7 +80,7 @@
                        "(" + QObject::tr("default") + ")"),
         PlayGroupDBStorage(this, _parent, "jump")
     {
-        setLabel(QObject::tr("Jump amount (in minutes)"));
+        setLabel(QObject::tr("Jump amount (minutes)"));
         setHelpText(QObject::tr("How many minutes to jump forward or backward "
                     "when the jump keys are pressed."));
     };
Index: /usr/src/mythtv-trunk/mythtv/libs/libmythtv/mpeg/dvbdescriptors.cpp
===================================================================
--- /usr/src/mythtv-trunk/mythtv/libs/libmythtv/mpeg/dvbdescriptors.cpp	(revision 24387)
+++ /usr/src/mythtv-trunk/mythtv/libs/libmythtv/mpeg/dvbdescriptors.cpp	(working copy)
@@ -297,7 +297,7 @@
 
     categoryDesc[0x40] = QObject::tr("Sports");
     categoryDesc[0x41] =
-        QObject::tr("Special Events (World Cup, World Series..)");
+        QObject::tr("Special Events (World Cup, World Series, etc)");
     categoryDesc[0x42] = QObject::tr("Sports Magazines");
     categoryDesc[0x43] = QObject::tr("Football (Soccer)");
     categoryDesc[0x44] = QObject::tr("Tennis/Squash");
Index: /usr/src/mythtv-trunk/mythtv/libs/libmythtv/tv_play.cpp
===================================================================
--- /usr/src/mythtv-trunk/mythtv/libs/libmythtv/tv_play.cpp	(revision 24387)
+++ /usr/src/mythtv-trunk/mythtv/libs/libmythtv/tv_play.cpp	(working copy)
@@ -294,7 +294,7 @@
             {
                 p = *it;
                 if (p->recstatus == rsRecorded && p->recgroup == "LiveTV")
-                    buttonTitle = tr("LiveTV, chan %1: %2");
+                    buttonTitle = tr("Live TV, chan %1: %2");
                 else
                     buttonTitle = tr("Chan %1: %2");
                 buttonTitle = buttonTitle.arg(p->chanstr).arg(p->title);
@@ -11171,7 +11171,7 @@
                            "inputs for the channel you selected. "
                            "If you want to watch an in-progress recording, "
                            "select one from the playback menu.  If you "
-                           "want to watch live TV, cancel one of the "
+                           "want to watch Live TV, cancel one of the "
                            "in-progress recordings from the delete "
                            "menu.");
             break;
Index: /usr/src/mythtv-trunk/mythtv/libs/libmythtv/videosource.cpp
===================================================================
--- /usr/src/mythtv-trunk/mythtv/libs/libmythtv/videosource.cpp	(revision 24387)
+++ /usr/src/mythtv-trunk/mythtv/libs/libmythtv/videosource.cpp	(working copy)
@@ -299,9 +299,9 @@
     {
         setLabel(QObject::tr("Perform EIT Scan"));
         setHelpText(QObject::tr(
-                        "If this is enabled the data in this source will be "
-                        "updated with listing data provided by the channels "
-                        "themselves 'over-the-air'."));
+                        "If enabled, program guide data for channels on this "
+                        "source will be updated with data provided by the "
+                        "channels themselves 'Over-the-Air'."));
     }
 };
 
@@ -437,7 +437,7 @@
 
     TransButtonSetting *config = new TransButtonSetting();
     config->setLabel(tr("Configure"));
-    config->setHelpText(tr("Run xmltv configure command."));
+    config->setHelpText(tr("Run XMLTV configure command."));
 
     addChild(config);
 
@@ -992,7 +992,7 @@
         SpinBoxSetting(this, min_val, 60000, 250),
         CaptureCardDBStorage(this, parent, "signal_timeout")
     {
-        setLabel(QObject::tr("Signal Timeout (msec)"));
+        setLabel(QObject::tr("Signal Timeout (ms)"));
         setValue(value);
         setHelpText(QObject::tr(
                         "Maximum time MythTV waits for any signal when "
@@ -1007,12 +1007,12 @@
         SpinBoxSetting(this, min_val, 65000, 250),
         CaptureCardDBStorage(this, parent, "channel_timeout")
     {
-        setLabel(QObject::tr("Tuning Timeout (msec)"));
+        setLabel(QObject::tr("Tuning Timeout (ms)"));
         setValue(value);
         setHelpText(QObject::tr(
                         "Maximum time MythTV waits for a channel lock "
-                        "when scanning for channels. Or, for issuing "
-                        "a warning in LiveTV mode."));
+                        "when scanning for channels, or for issuing "
+                        "a warning in Live TV mode."));
     };
 };
 
@@ -1025,7 +1025,7 @@
     {
         setLabel(QObject::tr("Audio sampling rate limit"));
         setHelpText(
-            QObject::tr("If other than None, override the audio sampling "
+            QObject::tr("If non-zero, override the audio sampling "
                         "rate in the recording profile when this card is "
                         "used.  Use this if your capture card does not "
                         "support all of the standard rates."));
@@ -1169,8 +1169,8 @@
         setLabel(QObject::tr("Wait for SEQ start header."));
         setValue(true);
         setHelpText(
-            QObject::tr("Make the dvb-recording drop packets from "
-                        "the card until a sequence start header is seen."));
+            QObject::tr("If enabled, drop packets from the start of a DVB "
+                        "recording until a sequence start header is seen."));
     };
 };
 
@@ -1184,9 +1184,8 @@
         setLabel(QObject::tr("Open DVB card on demand"));
         setValue(true);
         setHelpText(
-            QObject::tr("This option makes the backend dvb-recorder "
-                        "only open the card when it is actually in-use, leaving "
-                        "it free for other programs at other times."));
+            QObject::tr("If enabled, only open the DVB card when required, "
+                        "leaving it free for other programs at other times."));
     };
 };
 
@@ -1200,8 +1199,8 @@
         setLabel(QObject::tr("Use DVB Card for active EIT scan"));
         setValue(true);
         setHelpText(
-            QObject::tr("This option activates the active scan for "
-                        "program data (EIT). With this option enabled "
+            QObject::tr("If enabled, activate active scanning for "
+                        "program data (EIT). When this option is enabled "
                         "the DVB card is constantly in-use."));
     };
 };
@@ -1213,7 +1212,7 @@
         SpinBoxSetting(this, 0, 2000, 25),
         CaptureCardDBStorage(this, parent, "dvb_tuning_delay")
     {
-        setLabel(QObject::tr("DVB Tuning Delay (msec)"));
+        setLabel(QObject::tr("DVB Tuning Delay (ms)"));
         setHelpText(
             QObject::tr("Some Linux DVB drivers, in particular for the "
                         "Hauppauge Nova-T, require that we slow down "
@@ -1445,7 +1444,7 @@
     _overridedeviceid(QString::null)
 {
     setLabel(tr("Device ID"));
-    setHelpText(tr("Deviced ID of HDHomeRun device"));
+    setHelpText(tr("Device ID of HDHomeRun device"));
 }
 
 void HDHomeRunDeviceID::SetIP(const QString &ip)
@@ -1495,7 +1494,7 @@
     setLabel(QObject::tr("Available Devices"));
     setHelpText(
         QObject::tr(
-            "DevicedID and Tuner Number of available HDHomeRun devices."));
+            "Device ID and Tuner Number of available HDHomeRun devices."));
 
     connect(this, SIGNAL(valueChanged( const QString&)),
             this, SLOT(  UpdateDevices(const QString&)));
@@ -2253,7 +2252,7 @@
     {
         setLabel(QObject::tr("Display Name (optional)"));
         setHelpText(QObject::tr(
-                        "This name is displayed on screen when live TV begins "
+                        "This name is displayed on screen when Live TV begins "
                         "and when changing the selected input or card. If you "
                         "use this, make sure the information is unique for "
                         "each input."));
@@ -2424,7 +2423,7 @@
         addSelection(QObject::tr("Live TV only"), "1", false);
         addSelection(QObject::tr("Always"),       "2", false);
         setHelpText(QObject::tr(
-                        "If enabled MythTV will tune using only the "
+                        "If enabled, MythTV will tune using only the "
                         "MPEG program number. The program numbers "
                         "change more often than DVB or ATSC tuning "
                         "parameters, so this is slightly less reliable. "
@@ -2605,7 +2604,7 @@
     ingrpbtn->setLabel(QObject::tr("Create a New Input Group"));
     ingrpbtn->setHelpText(
         QObject::tr("Input groups are only needed when two or more cards "
-                    "share the same resource such as a firewire card and "
+                    "share the same resource such as a FireWire card and "
                     "an analog card input controlling the same set top box."));
     interact->addChild(ingrpbtn);
     interact->addChild(inputgrp0);
@@ -2936,8 +2935,8 @@
             gContext->GetMainWindow(),
             "",
             tr("Capture Card Menu"),
-            tr("Edit.."),
-            tr("Delete.."),
+            tr("Edit..."),
+            tr("Delete..."),
             kDialogCodeButton0);
 
         if (kDialogCodeButton0 == val)
@@ -3069,8 +3068,8 @@
             gContext->GetMainWindow(),
             "",
             tr("Video Source Menu"),
-            tr("Edit.."),
-            tr("Delete.."),
+            tr("Edit..."),
+            tr("Delete..."),
             kDialogCodeButton0);
 
         if (kDialogCodeButton0 == val)
Index: /usr/src/mythtv-trunk/mythtv/libs/libmythtv/channelsettings.cpp
===================================================================
--- /usr/src/mythtv-trunk/mythtv/libs/libmythtv/channelsettings.cpp	(revision 24387)
+++ /usr/src/mythtv-trunk/mythtv/libs/libmythtv/channelsettings.cpp	(working copy)
@@ -273,7 +273,7 @@
     {
         setValue(true);
         setLabel(QObject::tr("Visible"));
-        setHelpText(QObject::tr("If set, the channel will be visible in the "
+        setHelpText(QObject::tr("If enabled, the channel will be visible in the "
                     "EPG."));
     }
 };
@@ -285,8 +285,9 @@
         CheckBoxSetting(this), ChannelDBStorage(this, id, "useonairguide")
     {
         setLabel(QObject::tr("Use on air guide"));
-        setHelpText(QObject::tr("If set the guide information will be taken "
-                    "from the On Air Channel guide."));
+        setHelpText(QObject::tr("If enabled, guide information for this "
+                    "channel will be updated using 'Over-the-Air' "
+                    "program listings."));
     }
 };
 
@@ -303,7 +304,7 @@
         setLabel(QObject::tr("Frequency")+" "+QObject::tr("or")+" "+
                  QObject::tr("Channel"));
         setHelpText(QObject::tr(
-                        "Specify either the exact frequency in kHz or "
+                        "Specify either the exact frequency (in kHz) or "
                         "a valid channel for your 'TV Format'."));
     }
 };
@@ -317,7 +318,7 @@
     {
         setLabel(QObject::tr("Finetune")+" (kHz)");
         setHelpText(QObject::tr("Value to be added to your desired frequency "
-                                "in kHz, for 'fine tuning'."));
+                                "(in kHz) for 'fine tuning'."));
     }
 };
 
@@ -479,7 +480,7 @@
 ChannelOptionsV4L::ChannelOptionsV4L(const ChannelID& id) :
     VerticalConfigurationGroup(false, true, false, false)
 {
-    setLabel(QObject::tr("Channel Options - Video 4 Linux"));
+    setLabel(QObject::tr("Channel Options - Video4Linux"));
     setUseLabel(false);
 
     addChild(new Freqid(id));
Index: /usr/src/mythtv-trunk/mythtv/libs/libmythtv/recordingprofile.cpp
===================================================================
--- /usr/src/mythtv-trunk/mythtv/libs/libmythtv/recordingprofile.cpp	(revision 24387)
+++ /usr/src/mythtv-trunk/mythtv/libs/libmythtv/recordingprofile.cpp	(working copy)
@@ -521,10 +521,10 @@
         SliderSetting(this, 100, 8000, 100),
         CodecParamStorage(this, parent, "mpeg4bitrate")
     {
-        setLabel(QObject::tr("Bitrate"));
+        setLabel(QObject::tr("Bitrate (kb/s)"));
         setValue(2200);
-        setHelpText(QObject::tr("Bitrate in kilobits/second.  2200Kbps is "
-                    "approximately 1 Gigabyte per hour."));
+        setHelpText(QObject::tr("Bitrate in kilobits/second.  2200 kb/s is "
+                    "approximately 1 GB/hour."));
     };
 };
 
@@ -685,7 +685,7 @@
         setValue(default_br);
         setHelpText(QObject::tr(
                         "Average bit rate in kilobits/second. "
-                        "2200Kbps is approximately 1 Gigabyte per hour."));
+                        "2200 kb/s is approximately 1 GB/hour."));
     };
 };
 
@@ -705,7 +705,7 @@
         setLabel(label);
         setValue(default_br);
         setHelpText(QObject::tr("Maximum bit rate in kilobits/second. "
-                    "2200Kbps is approximately 1 Gigabyte per hour."));
+                    "2200 kb/s is approximately 1 GB/hour."));
     };
 };
 
Index: /usr/src/mythtv-trunk/mythtv/libs/libmythtv/transporteditor.cpp
===================================================================
--- /usr/src/mythtv-trunk/mythtv/libs/libmythtv/transporteditor.cpp	(revision 24387)
+++ /usr/src/mythtv-trunk/mythtv/libs/libmythtv/transporteditor.cpp	(working copy)
@@ -350,8 +350,8 @@
         gContext->GetMainWindow(),
         "",
         tr("Transport Menu"),
-        tr("Edit.."),
-        tr("Delete.."), kDialogCodeButton0);
+        tr("Edit..."),
+        tr("Delete..."), kDialogCodeButton0);
 
     if (kDialogCodeButton0 == val)
         emit Edit();
@@ -460,8 +460,8 @@
         setLabel(QObject::tr("Symbol Rate"));
         setHelpText(
             QObject::tr(
-                "Symbol Rate (symbols/second).\n"
-                "Most dvb-s transponders transmit at 27.5 "
+                "Symbol Rate (symbols/sec).\n"
+                "Most DVB-S transponders transmit at 27.5 "
                 "million symbols per second."));
         addSelection("3333000");
         addSelection("22000000");
Index: /usr/src/mythtv-trunk/mythtv/libs/libmythtv/videodisplayprofile.cpp
===================================================================
--- /usr/src/mythtv-trunk/mythtv/libs/libmythtv/videodisplayprofile.cpp	(revision 24387)
+++ /usr/src/mythtv-trunk/mythtv/libs/libmythtv/videodisplayprofile.cpp	(working copy)
@@ -731,23 +731,23 @@
     else if ("opengldoubleratelinearblend" == short_name)
         return QObject::tr("Linear blend (2x, HW)");
     else if ("opengldoubleratefieldorder" == short_name)
-        return QObject::tr("Interlaced (2x, Hw)");
+        return QObject::tr("Interlaced (2x, HW)");
     else if ("opengldoublerateyadif" == short_name)
-        return QObject::tr("Yadif (2x, Hw)");
+        return QObject::tr("Yadif (2x, HW)");
     else if ("openglyadif" == short_name)
-        return QObject::tr("Yadif (Hw)");
+        return QObject::tr("Yadif (HW)");
     else if ("vdpauonefield" == short_name)
-        return QObject::tr("One Field (1x, Hw)");
+        return QObject::tr("One Field (1x, HW)");
     else if ("vdpaubobdeint" == short_name)
-        return QObject::tr("Bob (2x, Hw)");
+        return QObject::tr("Bob (2x, HW)");
     else if ("vdpaubasic" == short_name)
-        return QObject::tr("Temporal (1x, Hw)");
+        return QObject::tr("Temporal (1x, HW)");
     else if ("vdpaubasicdoublerate" == short_name)
-        return QObject::tr("Temporal (2x, Hw)");
+        return QObject::tr("Temporal (2x, HW)");
     else if ("vdpauadvanced" == short_name)
-        return QObject::tr("Advanced (1x, Hw)");
+        return QObject::tr("Advanced (1x, HW)");
     else if ("vdpauadvanceddoublerate" == short_name)
-        return QObject::tr("Advanced (2x, Hw)");
+        return QObject::tr("Advanced (2x, HW)");
 
     return "";
 }
Index: /usr/src/mythtv-trunk/mythtv/libs/libmythui/myththemedmenu.cpp
===================================================================
--- /usr/src/mythtv-trunk/mythtv/libs/libmythui/myththemedmenu.cpp	(revision 24387)
+++ /usr/src/mythtv-trunk/mythtv/libs/libmythui/myththemedmenu.cpp	(working copy)
@@ -627,7 +627,7 @@
                                       "menu file %1").arg(menuname));
 
         if (menuname != "mainmenu.xml")
-            ShowOkPopup(QObject::tr("Myth could not locate the menu file %1")
+            ShowOkPopup(QObject::tr("MythTV could not locate the menu file %1")
                         .arg(menuname));
         return false;
     }
Index: /usr/src/mythtv-trunk/mythtv/libs/libmythui/mythprogressdialog.cpp
===================================================================
--- /usr/src/mythtv-trunk/mythtv/libs/libmythui/mythprogressdialog.cpp	(revision 24387)
+++ /usr/src/mythtv-trunk/mythtv/libs/libmythui/mythprogressdialog.cpp	(working copy)
@@ -12,7 +12,7 @@
     if (!message.isEmpty())
         m_message = message;
     else
-        m_message = tr("Please Wait ...");
+        m_message = tr("Please Wait...");
     m_messageText = NULL;
 }
 
Index: /usr/src/mythtv-trunk/mythtv/libs/libmyth/programinfo.cpp
===================================================================
--- /usr/src/mythtv-trunk/mythtv/libs/libmyth/programinfo.cpp	(revision 24387)
+++ /usr/src/mythtv-trunk/mythtv/libs/libmyth/programinfo.cpp	(working copy)
@@ -3862,8 +3862,8 @@
         QObject::tr("Live TV",        "Recording Profile Live TV") +
         QObject::tr("Low Quality",    "Recording Profile Low Quality") +
         QObject::tr("Medium Quality", "Recording Profile Medium Quality") +
-        QObject::tr("MPEG2",          "Recording Profile MPEG2") +
-        QObject::tr("RTjpeg/MPEG4",   "Recording Profile RTjpeg/MPEG4");
+        QObject::tr("MPEG-2",         "Recording Profile MPEG-2") +
+        QObject::tr("RTjpeg/MPEG-4",  "Recording Profile RTjpeg/MPEG-4");
 
 
     QString rec_profile_groups =
@@ -3885,23 +3885,23 @@
                     "Recording Profile Group Name") +
         QObject::tr("MPEG-2 Encoders (PVR-x50, PVR-500)",
                     "Recording Profile Group Name") +
-        QObject::tr("Software Encoders (v4l based)",
+        QObject::tr("Software Encoders (V4L based)",
                     "Recording Profile Group Name") +
         QObject::tr("Transcoders",
                     "Recording Profile Group Name") +
-        QObject::tr("USB Mpeg-4 Encoder (Plextor ConvertX, etc)",
+        QObject::tr("USB MPEG-4 Encoder (Plextor ConvertX, etc)",
                     "Recording Profile Group Name");
 
     QString display_rec_groups =
         QObject::tr("All Programs",   "Recording Group All Programs") +
         QObject::tr("All", "Recording Group All Programs -- short form") +
-        QObject::tr("LiveTV",         "Recording Group LiveTV") +
+        QObject::tr("Live TV",        "Recording Group Live TV") +
         QObject::tr("Default",        "Recording Group Default") +
         QObject::tr("Deleted",        "Recording Group Deleted");
 
     QString storage_groups =
         QObject::tr("Default",        "Storage Group Name") +
-        QObject::tr("LiveTV",         "Storage Group Name") +
+        QObject::tr("Live TV",        "Storage Group Name") +
         QObject::tr("Thumbnails",     "Storage Group Name") +
         QObject::tr("DB Backups",     "Storage Group Name");
 
Index: /usr/src/mythtv-trunk/mythtv/libs/libmyth/dbsettings.cpp
===================================================================
--- /usr/src/mythtv-trunk/mythtv/libs/libmyth/dbsettings.cpp	(revision 24387)
+++ /usr/src/mythtv-trunk/mythtv/libs/libmyth/dbsettings.cpp	(working copy)
@@ -89,7 +89,7 @@
         info->setValue(QObject::tr("All database settings take effect when "
                                    "you restart this program."));
     else
-        info->setValue(QObject::tr("Myth could not connect to the database. "
+        info->setValue(QObject::tr("MythTV could not connect to the database. "
                                    "Please verify your database settings "
                                    "below."));
     addChild(info);
@@ -194,7 +194,7 @@
 
     wolEnabled = new TransCheckBoxSetting();
     wolEnabled->setLabel(QObject::tr("Enable Database Server Wakeup"));
-    wolEnabled->setHelpText(QObject::tr("If checked, the frontend will use "
+    wolEnabled->setHelpText(QObject::tr("If enabled, the frontend will use "
                                         "database wakeup parameters to "
                                         "reconnect to the database server."));
 
Index: /usr/src/mythtv-trunk/mythtv/libs/libmyth/mythcontext.cpp
===================================================================
--- /usr/src/mythtv-trunk/mythtv/libs/libmyth/mythcontext.cpp	(revision 24387)
+++ /usr/src/mythtv-trunk/mythtv/libs/libmyth/mythcontext.cpp	(working copy)
@@ -1298,12 +1298,12 @@
     QString message = (persistent) ?
         QObject::tr(
             "The connection to the master backend "
-            "server has gone away for some reason.. "
+            "server has gone away for some reason. "
             "Is it running?") :
         QObject::tr(
-            "Could not connect to the master backend server -- is "
-            "it running?  Is the IP address set for it in the "
-            "setup program correct?");
+            "Could not connect to the master backend server. Is "
+            "it running?  Is the IP address set for it in "
+            "mythtv-setup correct?");
 
     if (mainWindow && m_ui && m_ui->IsScreenSetup())
     {
Index: /usr/src/mythtv-trunk/mythtv/libs/libmyth/backendselect.cpp
===================================================================
--- /usr/src/mythtv-trunk/mythtv/libs/libmyth/backendselect.cpp	(revision 24387)
+++ /usr/src/mythtv-trunk/mythtv/libs/libmyth/backendselect.cpp	(working copy)
@@ -194,7 +194,7 @@
 #endif
 
 
-    label = new QLabel(tr("Please select default Myth Backend Server"), this);
+    label = new QLabel(tr("Please select default MythTV Backend Server"), this);
 
     m_backends = new QListWidget(this);
     OK         = new MythPushButton(tr("OK"), this);
Index: /usr/src/mythtv-trunk/mythtv/programs/mythfrontend/playbackbox.cpp
===================================================================
--- /usr/src/mythtv-trunk/mythtv/programs/mythfrontend/playbackbox.cpp	(revision 24387)
+++ /usr/src/mythtv-trunk/mythtv/programs/mythfrontend/playbackbox.cpp	(working copy)
@@ -1500,7 +1500,7 @@
                     (p->recgroup == "LiveTV") &&
                     (m_viewMask & VIEW_LIVETVGRP))
                 {
-                    QString tmpTitle = tr("LiveTV");
+                    QString tmpTitle = tr("Live TV");
                     sortedList[tmpTitle.toLower()] = tmpTitle;
                     m_progLists[tmpTitle.toLower()].push_front(p);
                     m_progLists[tmpTitle.toLower()].setAutoDelete(false);
@@ -1830,8 +1830,8 @@
     if (m_progLists[m_watchGroupLabel].size() > 0)
         m_titleList << m_watchGroupName;
     if ((m_progLists["livetv"].size() > 0) &&
-        (!sortedList.values().contains(tr("LiveTV"))))
-        m_titleList << tr("LiveTV");
+        (!sortedList.values().contains(tr("Live TV"))))
+        m_titleList << tr("Live TV");
     m_titleList << sortedList.values();
 
     // Populate list of recording groups
@@ -3319,9 +3319,9 @@
 {
     // LiveTV ProgramInfo's are not in the aggregated list
     ProgramList::iterator _it[2] = {
-        m_progLists[tr("LiveTV").toLower()].begin(), m_progLists[""].begin() };
+        m_progLists[tr("Live TV").toLower()].begin(), m_progLists[""].begin() };
     ProgramList::iterator _end[2] = {
-        m_progLists[tr("LiveTV").toLower()].end(),   m_progLists[""].end()   };
+        m_progLists[tr("Live TV").toLower()].end(),   m_progLists[""].end()   };
 
     if (recgroup != "LiveTV")
     {
@@ -4211,7 +4211,7 @@
 
             dispGroup = (dispGroup == "Default") ? tr("Default") : dispGroup;
             dispGroup = (dispGroup == "Deleted") ? tr("Deleted") : dispGroup;
-            dispGroup = (dispGroup == "LiveTV")  ? tr("LiveTV")  : dispGroup;
+            dispGroup = (dispGroup == "LiveTV")  ? tr("Live TV")  : dispGroup;
 
             displayNames.append(tr("%1 [%n item(s)]", 0, items).arg(dispGroup));
 
@@ -4399,7 +4399,7 @@
         if (dispGroup == "Default")
             dispGroup = tr("Default");
         else if (dispGroup == "LiveTV")
-            dispGroup = tr("LiveTV");
+            dispGroup = tr("Live TV");
         else if (dispGroup == "Deleted")
             dispGroup = tr("Deleted");
 
Index: /usr/src/mythtv-trunk/mythtv/programs/mythfrontend/scheduleeditor.cpp
===================================================================
--- /usr/src/mythtv-trunk/mythtv/programs/mythfrontend/scheduleeditor.cpp	(revision 24387)
+++ /usr/src/mythtv-trunk/mythtv/programs/mythfrontend/scheduleeditor.cpp	(working copy)
@@ -813,7 +813,7 @@
         if (*it == "Default")
             dispValue = tr("Default");
         else if (*it == "LiveTV")
-            dispValue = tr("LiveTV");
+            dispValue = tr("Live TV");
         else
             dispValue = *it;
 
Index: /usr/src/mythtv-trunk/mythtv/programs/mythfrontend/globalsettings.cpp
===================================================================
--- /usr/src/mythtv-trunk/mythtv/programs/mythfrontend/globalsettings.cpp	(revision 24387)
+++ /usr/src/mythtv-trunk/mythtv/programs/mythfrontend/globalsettings.cpp	(working copy)
@@ -120,9 +120,9 @@
     HostCheckBox *gc = new HostCheckBox("AudioDefaultUpmix");
     gc->setLabel(QObject::tr("Upconvert stereo to 5.1 surround"));
     gc->setValue(true);
-    gc->setHelpText(QObject::tr("MythTV can upconvert stereo to 5.1 audio. "
-                                "Set this option to enable it by default. "
-                                "You can enable or disable the upconversion during playback at anytime."));
+    gc->setHelpText(QObject::tr("If enabled, MythTV will upconvert stereo to 5.1 audio "
+                                "by default. You can enable or disable the upconversion "
+                                "during playback at anytime."));
     return gc;
 }
 
@@ -154,7 +154,7 @@
     HostCheckBox *gc = new HostCheckBox("SRCQualityOverride");
     gc->setLabel(QObject::tr("Override SRC quality"));
     gc->setValue(false);
-    gc->setHelpText(QObject::tr("Override audio sample rate conversion quality"));
+    gc->setHelpText(QObject::tr("Enable to override audio sample rate conversion quality"));
     return gc;
 }
 
@@ -201,7 +201,7 @@
     HostCheckBox *gc = new HostCheckBox("MythControlsVolume");
     gc->setLabel(QObject::tr("Use internal volume controls"));
     gc->setValue(true);
-    gc->setHelpText(QObject::tr("MythTV can control the PCM and master "
+    gc->setHelpText(QObject::tr("If enabled, MythTV will control the PCM and master "
                     "mixer volume.  If you prefer to control the volume externally "
                     "(like your amplifier) or use an external mixer "
                     "program, disable this option."));
@@ -402,9 +402,9 @@
     HostCheckBox *gc = new HostCheckBox("QueryInitialFilter");
     gc->setLabel(QObject::tr("Always prompt for initial group filter"));
     gc->setValue(false);
-    gc->setHelpText(QObject::tr("Always prompt the user for the initial filter "
-                    "to apply when entering the Watch Recordings screen."));
-
+    gc->setHelpText(QObject::tr("If enabled, always prompt the user for the "
+                                "initial filter to apply when entering the "
+                                "Watch Recordings screen."));
     return gc;
 }
 
@@ -413,10 +413,9 @@
     HostCheckBox *gc = new HostCheckBox("RememberRecGroup");
     gc->setLabel(QObject::tr("Save current group filter when changed"));
     gc->setValue(true);
-    gc->setHelpText(QObject::tr("Remember the last selected filter "
+    gc->setHelpText(QObject::tr("If enabled, remember the last selected filter "
                     "instead of displaying the default filter "
                     "whenever you enter the playback screen."));
-
     return gc;
 }
 
@@ -425,9 +424,9 @@
     HostCheckBox *gc = new HostCheckBox("DispRecGroupAsAllProg");
     gc->setLabel(QObject::tr("Show filter name instead of \"All Programs\""));
     gc->setValue(false);
-    gc->setHelpText(QObject::tr("Use the name of the display filter currently "
-                    "applied in place of the term \"All Programs\" in the "
-                    "playback screen."));
+    gc->setHelpText(QObject::tr("If enabled, use the name of the display "
+                    "filter currently applied in place of the term \"All "
+                    "Programs\" in the playback screen."));
     return gc;
 }
 
@@ -569,16 +568,16 @@
     bc->setLabel(QObject::tr("Skip blank frames after commercials"));
     bc->setValue(true);
     bc->setHelpText(QObject::tr("When using Blank Frame Detection and "
-                    "Auto-Flagging, include blank frames following commercial "
-                    "breaks as part of the commercial break."));
+                    "Auto-Flagging, enable to include blank frames following "
+                    "commercial breaks as part of the commercial break."));
     return bc;
 }
 
 static HostSpinBox *CommRewindAmount()
 {
     HostSpinBox *gs = new HostSpinBox("CommRewindAmount", 0, 10, 1);
-    gs->setLabel(QObject::tr("Commercial Skip Auto-Rewind Amount"));
-    gs->setHelpText(QObject::tr("If set, MythTV will automatically rewind "
+    gs->setLabel(QObject::tr("Commercial Skip Auto-Rewind Amount (seconds)"));
+    gs->setHelpText(QObject::tr("MythTV will automatically rewind "
                     "this many seconds after performing a commercial skip."));
     gs->setValue(0);
     return gs;
@@ -587,8 +586,8 @@
 static HostSpinBox *CommNotifyAmount()
 {
     HostSpinBox *gs = new HostSpinBox("CommNotifyAmount", 0, 10, 1);
-    gs->setLabel(QObject::tr("Commercial Skip Notify Amount"));
-    gs->setHelpText(QObject::tr("If set, MythTV will act like a commercial "
+    gs->setLabel(QObject::tr("Commercial Skip Notify Amount (seconds)"));
+    gs->setHelpText(QObject::tr("MythTV will act like a commercial "
                     "begins this many seconds early.  This can be useful "
                     "when commercial notification is used in place of "
                     "automatic skipping."));
@@ -599,7 +598,7 @@
 static GlobalSpinBox *MaximumCommercialSkip()
 {
     GlobalSpinBox *bs = new GlobalSpinBox("MaximumCommercialSkip", 0, 3600, 10);
-    bs->setLabel(QObject::tr("Maximum commercial skip (in seconds)"));
+    bs->setLabel(QObject::tr("Maximum commercial skip (seconds)"));
     bs->setHelpText(QObject::tr("MythTV will discourage long manual commercial "
                     "skips.  Skips which are longer than this will require the "
                     "user to hit the SKIP key twice.  Automatic commercial "
@@ -611,7 +610,7 @@
 static GlobalSpinBox *MergeShortCommBreaks()
 {
     GlobalSpinBox *bs = new GlobalSpinBox("MergeShortCommBreaks", 0, 3600, 5);
-    bs->setLabel(QObject::tr("Merge short commercial breaks (in seconds)"));
+    bs->setLabel(QObject::tr("Merge short commercial breaks (seconds)"));
     bs->setHelpText(QObject::tr("Treat consecutive commercial breaks shorter "
                     "than this as one break when skipping forward. Useful if "
                     "you have to skip a few times during breaks. Applies to "
@@ -623,8 +622,8 @@
 static GlobalSpinBox *AutoExpireExtraSpace()
 {
     GlobalSpinBox *bs = new GlobalSpinBox("AutoExpireExtraSpace", 0, 200, 1);
-    bs->setLabel(QObject::tr("Extra Disk Space"));
-    bs->setHelpText(QObject::tr("Extra disk space (in Gigabytes) that you want "
+    bs->setLabel(QObject::tr("Extra Disk Space (GB)"));
+    bs->setHelpText(QObject::tr("Extra disk space (in GB) that you want "
                     "to keep free on the recording file systems beyond what "
                     "MythTV requires."));
     bs->setValue(1);
@@ -636,16 +635,16 @@
     GlobalCheckBox *cb = new GlobalCheckBox("AutoExpireInsteadOfDelete");
     cb->setLabel(QObject::tr("Auto Expire Instead of Delete Recording"));
     cb->setValue(false);
-    cb->setHelpText(QObject::tr("Instead of deleting a recording, "
-                    "move recording to the 'Deleted' recgroup and turn on "
-                    "autoexpire."));
+    cb->setHelpText(QObject::tr("If enabled, move deleted recordings to the "
+                                "'Deleted' recgroup and turn on autoexpire "
+                                "instead of deleting immediately."));
     return cb;
 }
 
 static GlobalSpinBox *DeletedMaxAge()
 {
     GlobalSpinBox *bs = new GlobalSpinBox("DeletedMaxAge", 0, 365, 1);
-    bs->setLabel(QObject::tr("Deleted Max Age"));
+    bs->setLabel(QObject::tr("Deleted Max Age (days)"));
     bs->setHelpText(QObject::tr("When set to a number greater than zero, "
                     "AutoExpire will force expiration of Deleted recordings "
                     "when they are this many days old."));
@@ -659,7 +658,7 @@
     cb->setLabel(QObject::tr("Expire in deleted order"));
     cb->setValue(false);
     cb->setHelpText(QObject::tr(
-                    "Expire Deleted recordings in the order which they were "
+                    "If enabled, delete recordings in the order which they were "
                     "originally deleted."));
     return cb;
 };
@@ -705,7 +704,7 @@
     GlobalCheckBox *bc = new GlobalCheckBox("AutoExpireWatchedPriority");
     bc->setLabel(QObject::tr("Watched before UNwatched"));
     bc->setValue(false);
-    bc->setHelpText(QObject::tr("If set, programs that have been marked as "
+    bc->setHelpText(QObject::tr("If enabled, programs that have been marked as "
                     "watched will be expired before programs that have not "
                     "been watched."));
     return bc;
@@ -727,7 +726,7 @@
     GlobalCheckBox *bc = new GlobalCheckBox("AutoExpireDefault");
     bc->setLabel(QObject::tr("Auto Expire Default"));
     bc->setValue(true);
-    bc->setHelpText(QObject::tr("When enabled, any new recording schedules "
+    bc->setHelpText(QObject::tr("If enabled, any new recording schedules "
                     "will be marked as eligible for Auto-Expiration. "
                     "Existing schedules will keep their current value."));
     return bc;
@@ -736,7 +735,7 @@
 static GlobalSpinBox *AutoExpireLiveTVMaxAge()
 {
     GlobalSpinBox *bs = new GlobalSpinBox("AutoExpireLiveTVMaxAge", 1, 365, 1);
-    bs->setLabel(QObject::tr("LiveTV Max Age"));
+    bs->setLabel(QObject::tr("LiveTV Max Age (days)"));
     bs->setHelpText(QObject::tr("AutoExpire will force expiration of LiveTV "
                     "recordings when they are this many days old. LiveTV "
                     "recordings may also be expired early if necessary to "
@@ -751,9 +750,9 @@
     GlobalSpinBox *bs = new GlobalSpinBox("MinRecordDiskThreshold",
                                             0, 1000000, 100);
     bs->setLabel(QObject::tr("New Recording Free Disk Space Threshold "
-                 "(in Megabytes)"));
+                 "(MB)"));
     bs->setHelpText(QObject::tr("MythTV will stop scheduling new recordings on "
-                    "a backend when its free disk space falls below this "
+                    "a backend when its free disk space (in MB) falls below this "
                     "value."));
     bs->setValue(300);
     return bs;
@@ -765,7 +764,7 @@
     GlobalCheckBox *bc = new GlobalCheckBox("RerecordWatched");
     bc->setLabel(QObject::tr("Re-record Watched"));
     bc->setValue(true);
-    bc->setHelpText(QObject::tr("If set, programs that have been marked as "
+    bc->setHelpText(QObject::tr("If enabled, programs that have been marked as "
                     "watched and are auto-expired will be re-recorded if "
                     "they are shown again."));
     return bc;
@@ -775,7 +774,7 @@
 {
     GlobalSpinBox *bs = new GlobalSpinBox("RecordPreRoll", 0, 600, 60, true);
     bs->setLabel(QObject::tr("Time to record before start of show "
-                 "(in seconds)"));
+                 "(seconds)"));
     bs->setHelpText(QObject::tr("This global setting allows the recorder "
                     "to start before the scheduled start time. It does "
                     "not affect the scheduler. It is ignored when two shows "
@@ -787,7 +786,7 @@
 static GlobalSpinBox *RecordOverTime()
 {
     GlobalSpinBox *bs = new GlobalSpinBox("RecordOverTime", 0, 1800, 60, true);
-    bs->setLabel(QObject::tr("Time to record past end of show (in seconds)"));
+    bs->setLabel(QObject::tr("Time to record past end of show (seconds)"));
     bs->setValue(0);
     bs->setHelpText(QObject::tr("This global setting allows the recorder "
                     "to record beyond the scheduled end time. It does "
@@ -825,12 +824,12 @@
 {
     GlobalSpinBox *bs = new GlobalSpinBox("CategoryOverTime",
                                           0, 180, 60, true);
-    bs->setLabel(QObject::tr("Record past end of show (in minutes)"));
+    bs->setLabel(QObject::tr("Record past end of show (minutes)"));
     bs->setValue(30);
     bs->setHelpText(QObject::tr("For the specified category, an attempt "
                     "will be made to extend the recording by the specified "
-                    "time.  It is ignored when two shows have been scheduled "
-                    "without enough time in between."));
+                    "number of minutes.  It is ignored when two shows have "
+                    "been scheduled without enough time in between."));
     return bs;
 }
 
@@ -936,7 +935,7 @@
     skiploop->setHelpText(
         tr("When unchecked the deblocking loopfilter will be disabled ") + "\n" +
         tr("Disabling will significantly reduce the load on the CPU "
-           "when watching HD h264 but may significantly reduce video quality."));
+           "when watching HD H.264 but may significantly reduce video quality."));
 
     osdfade->setHelpText(
         tr("When unchecked the OSD will not fade away but instead "
@@ -1600,9 +1599,9 @@
 static HostSpinBox *OSDGeneralTimeout()
 {
     HostSpinBox *gs = new HostSpinBox("OSDGeneralTimeout", 1, 30, 1);
-    gs->setLabel(QObject::tr("General OSD time-out (sec)"));
+    gs->setLabel(QObject::tr("General OSD time-out (seconds)"));
     gs->setValue(2);
-    gs->setHelpText(QObject::tr("Length of time an on-screen display "
+    gs->setHelpText(QObject::tr("How many seconds the on-screen display "
                     "window will be visible."));
     return gs;
 }
@@ -1610,9 +1609,9 @@
 static HostSpinBox *OSDProgramInfoTimeout()
 {
     HostSpinBox *gs = new HostSpinBox("OSDProgramInfoTimeout", 1, 30, 1);
-    gs->setLabel(QObject::tr("Program Info OSD time-out"));
+    gs->setLabel(QObject::tr("Program Info OSD time-out (seconds)"));
     gs->setValue(3);
-    gs->setHelpText(QObject::tr("Length of time the on-screen display "
+    gs->setHelpText(QObject::tr("How many seconds the on-screen display "
                     "will display program information."));
     return gs;
 }
@@ -1620,9 +1619,9 @@
 static HostSpinBox *OSDNotifyTimeout()
 {
     HostSpinBox *gs = new HostSpinBox("OSDNotifyTimeout", 1, 30, 1);
-    gs->setLabel(QObject::tr("UDP Notify OSD time-out"));
+    gs->setLabel(QObject::tr("UDP Notify OSD time-out (seconds)"));
     gs->setValue(5);
-    gs->setHelpText(QObject::tr("How many seconds an on-screen display "
+    gs->setHelpText(QObject::tr("How many seconds the on-screen display "
                     "will be active for UDP Notify events."));
     return gs;
 }
@@ -1704,7 +1703,7 @@
     gc->addSelection(QObject::tr("PAL Teletext"),        "pal_txt", 1 == sel);
     gc->addSelection(QObject::tr("NTSC Closed Caption"), "ntsc_cc", 2 == sel);
     gc->setHelpText(
-        QObject::tr("If set, this overrides the mythtv-setup setting "
+        QObject::tr("If enabled, this overrides the mythtv-setup setting "
                     "used during recording when decoding captions."));
 
     return gc;
@@ -1935,10 +1934,9 @@
     gc->setLabel(QObject::tr("Always stream recordings from the backend"));
     gc->setValue(false);
     gc->setHelpText(QObject::tr(
-                        "Enable this setting if you want MythTV to "
-                        "always stream files from a remote backend "
-                        "instead of directly reading a recording "
-                        "file if it is accessible locally."));
+                        "If enabled, MythTV will always stream files from a "
+                        "remote backend instead of directly reading a "
+                        "recording file if it is accessible locally."));
     return gc;
 }
 
@@ -1962,7 +1960,7 @@
     gc->setHelpText(QObject::tr(
                         "If enabled, captions will be displayed "
                         "when playing back recordings or watching "
-                        "live TV.  Closed Captioning can be turned on or off "
+                        "Live TV.  Closed Captioning can be turned on or off "
                         "by pressing \"T\" during playback."));
     return gc;
 }
@@ -1974,8 +1972,8 @@
     gc->setValue(true);
     gc->setHelpText(
         QObject::tr(
-            "When enabled the new EIA-708 captions will be preferred over "
-            "the old EIA-608 captions in ATSC streams."));
+            "If enabled, the newer EIA-708 captions will be preferred over "
+            "the older EIA-608 captions in ATSC streams."));
 
     return gc;
 }
@@ -2022,8 +2020,8 @@
     HostCheckBox *gc = new HostCheckBox("ClearSavedPosition");
     gc->setLabel(QObject::tr("Clear bookmark on playback"));
     gc->setValue(true);
-    gc->setHelpText(QObject::tr("Automatically clear the bookmark on a "
-                    "recording when the recording is played back.  If "
+    gc->setHelpText(QObject::tr("If enabled, automatically clear the bookmark "
+                    "on a recording when the recording is played back.  If "
                     "disabled, you can mark the beginning with rewind "
                     "then save position."));
     return gc;
@@ -2089,7 +2087,7 @@
     HostCheckBox *gc = new HostCheckBox("EndOfRecordingExitPrompt");
     gc->setLabel(QObject::tr("Prompt at end of recording"));
     gc->setValue(false);
-    gc->setHelpText(QObject::tr("If set, a menu will be displayed allowing "
+    gc->setHelpText(QObject::tr("If enabled, a menu will be displayed allowing "
                     "you to delete the recording when it has finished "
                     "playing."));
     return gc;
@@ -2104,7 +2102,7 @@
                         "Set the choice between viewing the current "
                         "recording group in the OSD, or showing the "
                         "'Watch Recording' screen when 'Jump to Program' "
-                        "is activated. If set, the recordings are shown "
+                        "is activated. If enabled, the recordings are shown "
                         "in the OSD"));
     return gc;
 }
@@ -2115,7 +2113,7 @@
     gc->setLabel(QObject::tr("Continue Playback When Embedded"));
     gc->setValue(false);
     gc->setHelpText(QObject::tr(
-                    "This option continues TV playback when the TV window "
+                    "If enabled, TV playback continues when the TV window "
                     "is embedded in the upcoming program list or recorded "
                     "list. The default is to pause the recorded show when "
                     "embedded."));
@@ -2127,7 +2125,7 @@
     HostCheckBox *gc = new HostCheckBox("AutomaticSetWatched");
     gc->setLabel(QObject::tr("Automatically mark a recording as watched"));
     gc->setValue(false);
-    gc->setHelpText(QObject::tr("If set, when you exit near the end of a "
+    gc->setHelpText(QObject::tr("If enabled, when you exit near the end of a "
                     "recording it will be marked as watched. The automatic "
                     "detection is not foolproof, so do not enable this "
                     "setting if you don't want an unwatched recording marked "
@@ -2138,10 +2136,10 @@
 static HostSpinBox *LiveTVIdleTimeout()
 {
     HostSpinBox *gs = new HostSpinBox("LiveTVIdleTimeout", 0, 3600, 1);
-    gs->setLabel(QObject::tr("Live TV idle timeout"));
+    gs->setLabel(QObject::tr("Live TV idle timeout (minutes)"));
     gs->setValue(0);
     gs->setHelpText(QObject::tr(
-                        "Exit LiveTV automatically if left idle for the "
+                        "Exit Live TV automatically if left idle for the "
                         "specified number of minutes. "
                         "0 disables the timeout."));
     return gs;
@@ -2152,7 +2150,7 @@
     HostCheckBox *gc = new HostCheckBox("PlaybackPreview");
     gc->setLabel(QObject::tr("Display live preview of recordings"));
     gc->setValue(true);
-    gc->setHelpText(QObject::tr("When enabled, a preview of the recording "
+    gc->setHelpText(QObject::tr("If enabled, a preview of the recording "
                     "will play in a small window on the \"Watch a "
                     "Recording\" menu."));
     return gc;
@@ -2165,9 +2163,10 @@
     gc->setValue(false);
     gc->setHelpText(
         QObject::tr(
-            "Use HW acceleration for the live recording preview. "
-            "Video renderer used is determined by the CPU profiles. "
-            "Disable if playback is sluggish or causes high CPU"));
+            "If enabled, live recording preview will use hardware "
+            "acceleration. The video renderer used is determined by the "
+            "selected CPU profile. Disable if playback is sluggish or "
+            "causes high CPU load"));
     return gc;
 }
 
@@ -2178,8 +2177,8 @@
     gc->setValue(false);
     gc->setHelpText(
         QObject::tr(
-            "If you have a very slow frontend you can enable this to "
-            "always have a backend server generate preview images."));
+            "If enabled, a backend server will generate preview images. "
+            "Recommended for very slow frontends."));
     return gc;
 }
 
@@ -2214,8 +2213,8 @@
     HostCheckBox *gc = new HostCheckBox("UseVirtualKeyboard");
     gc->setLabel(QObject::tr("Use line edit virtual keyboards"));
     gc->setValue(true);
-    gc->setHelpText(QObject::tr("Allows you to use a virtual keyboard "
-                    "in Myth line edit boxes.  To use, hit OK/Select "
+    gc->setHelpText(QObject::tr("If enabled, you can use a virtual keyboard "
+                    "in MythTV's line edit boxes.  To use, hit OK/Select "
                     "while a line edit is in focus."));
     return gc;
 }
@@ -2258,7 +2257,7 @@
     HostCheckBox *gc = new HostCheckBox("NoPromptOnExit");
     gc->setLabel(QObject::tr("Confirm Exit"));
     gc->setValue(true);
-    gc->setHelpText(QObject::tr("When enabled, MythTV will prompt "
+    gc->setHelpText(QObject::tr("If enabled, MythTV will prompt "
                     "for confirmation when you press the System Exit "
                     "key."));
     return gc;
@@ -2351,7 +2350,7 @@
     HostCheckBox *gc = new HostCheckBox("SetupPinCodeRequired");
     gc->setLabel(QObject::tr("Require Setup PIN") + "    ");
     gc->setValue(false);
-    gc->setHelpText(QObject::tr("If set, you will not be able to return "
+    gc->setHelpText(QObject::tr("If enabled, you will not be able to return "
                     "to this screen and reset the Setup PIN without first "
                     "entering the current PIN."));
     return gc;
@@ -2434,7 +2433,7 @@
 static HostSpinBox *GuiWidth()
 {
     HostSpinBox *gs = new HostSpinBox("GuiWidth", 0, 1920, 8, true);
-    gs->setLabel(QObject::tr("GUI width (px)"));
+    gs->setLabel(QObject::tr("GUI width (pixels)"));
     gs->setValue(0);
     gs->setHelpText(QObject::tr("The width of the GUI.  Do not make the GUI "
                     "wider than your actual screen resolution.  Set to 0 to "
@@ -2445,7 +2444,7 @@
 static HostSpinBox *GuiHeight()
 {
     HostSpinBox *gs = new HostSpinBox("GuiHeight", 0, 1600, 8, true);
-    gs->setLabel(QObject::tr("GUI height (px)"));
+    gs->setLabel(QObject::tr("GUI height (pixels)"));
     gs->setValue(0);
     gs->setHelpText(QObject::tr("The height of the GUI.  Do not make the GUI "
                     "taller than your actual screen resolution.  Set to 0 to "
@@ -2728,7 +2727,7 @@
     gc->setLabel(QObject::tr("Use fixed window size"));
     gc->setValue(true);
     gc->setHelpText(QObject::tr(
-                        "When disabled the video playback "
+                        "If disabled, the video playback "
                         "window can be resized"));
     return gc;
 }
@@ -3042,7 +3041,7 @@
     HostCheckBox *gc = new HostCheckBox("EPGShowCategoryColors");
     gc->setLabel(QObject::tr("Display Genre Colors"));
     gc->setHelpText(QObject::tr("Colorize program guide using "
-                    "genre colors. (Not available for all grabbers.)"));
+                    "genre colors (not available for all grabbers)."));
     gc->setValue(true);
     return gc;
 }
@@ -3155,7 +3154,7 @@
     GlobalCheckBox *bc = new GlobalCheckBox("SchedOpenEnd");
     bc->setLabel(QObject::tr("Avoid back to back recordings from different "
                     "channels"));
-    bc->setHelpText(QObject::tr("If set, the scheduler will avoid assigning "
+    bc->setHelpText(QObject::tr("If enabled, the scheduler will avoid assigning "
                     "shows from different channels to the same card if their "
                     "end time and start time match. This will be allowed "
                     "when necessary in order to resolve conflicts."));
@@ -3377,7 +3376,7 @@
     ge->setLabel(QObject::tr("Guide starts at channel"));
     ge->setValue("3");
     ge->setHelpText(QObject::tr("The program guide starts on this channel if "
-                    "it is run from outside of LiveTV mode."));
+                    "it is run from outside of Live TV mode."));
     return ge;
 }
 
@@ -3707,7 +3706,7 @@
     HostCheckBox *gc = new HostCheckBox("PlaybackWLStart");
     gc->setLabel(QObject::tr("Start from the Watch List view"));
     gc->setValue(false);
-    gc->setHelpText(QObject::tr("If set, the 'Watch List' will be the "
+    gc->setHelpText(QObject::tr("If enabled, the 'Watch List' will be the "
                     "initial view each time you enter the "
                     "Watch Recordings screen"));
     return gc;
@@ -3779,7 +3778,7 @@
     gc->setLabel(QObject::tr("Enable OpenGL vertical sync for timing"));
     gc->setValue(false);
     gc->setHelpText(QObject::tr(
-                        "If it is supported by your hardware/drivers, "
+                        "If supported by your hardware/drivers, "
                         "MythTV will use OpenGL vertical syncing for "
                         "video timing, reducing frame jitter."));
     return gc;
@@ -3818,7 +3817,7 @@
 {
     HostSpinBox *gs = new HostSpinBox("LCDPopupTime", 1, 300, 1, true);
     gs->setLabel(QObject::tr("Menu Pop-up Time"));
-    gs->setHelpText(QObject::tr("The time (in seconds) that the menu will "
+    gs->setHelpText(QObject::tr("How many seconds the menu will "
                     "remain visible after navigation."));
     gs->setValue(5);
     return gs;
@@ -3976,7 +3975,7 @@
     HostCheckBox *gc = new HostCheckBox("MacGammaCorrect");
     gc->setLabel(QObject::tr("Enable gamma correction for video"));
     gc->setValue(false);
-    gc->setHelpText(QObject::tr("If checked, QuickTime will correct the gamma "
+    gc->setHelpText(QObject::tr("If enabled, QuickTime will correct the gamma "
                     "of the video to match your monitor.  Turning this off can "
                     "save some CPU cycles."));
     return gc;
@@ -3987,7 +3986,7 @@
     HostCheckBox *gc = new HostCheckBox("MacScaleUp");
     gc->setLabel(QObject::tr("Scale video as necessary"));
     gc->setValue(true);
-    gc->setHelpText(QObject::tr("If checked, video will be scaled to fit your "
+    gc->setHelpText(QObject::tr("If enabled, video will be scaled to fit your "
                     "window or screen. If unchecked, video will never be made "
                     "larger than its actual pixel size."));
     return gc;
@@ -4011,7 +4010,7 @@
     HostCheckBox *gc = new HostCheckBox("MacMainEnabled");
     gc->setLabel(QObject::tr("Video in main window"));
     gc->setValue(true);
-    gc->setHelpText(QObject::tr("If checked, video will be displayed in the "
+    gc->setHelpText(QObject::tr("If enabled, video will be displayed in the "
                     "main GUI window. Disable this when you only want video "
                     "on the desktop or in a floating window. Only valid when "
                     "\"Use GUI size for TV playback\" and \"Run the "
@@ -4067,7 +4066,7 @@
     HostCheckBox *gc = new HostCheckBox("MacFloatEnabled");
     gc->setLabel(QObject::tr("Video in floating window"));
     gc->setValue(false);
-    gc->setHelpText(QObject::tr("If checked, video will be displayed in a "
+    gc->setHelpText(QObject::tr("If enabled, video will be displayed in a "
                     "floating window. Only valid when \"Use GUI size for TV "
                     "playback\" and \"Run the frontend in a window\" are "
                     "checked."));
@@ -4122,7 +4121,7 @@
     HostCheckBox *gc = new HostCheckBox("MacDockEnabled");
     gc->setLabel(QObject::tr("Video in the dock"));
     gc->setValue(true);
-    gc->setHelpText(QObject::tr("If checked, video will be displayed in the "
+    gc->setHelpText(QObject::tr("If enabled, video will be displayed in the "
                     "application's dock icon. Only valid when \"Use GUI size "
                     "for TV playback\" and \"Run the frontend in a window\" "
                     "are checked."));
@@ -4162,7 +4161,7 @@
     HostCheckBox *gc = new HostCheckBox("MacDesktopEnabled");
     gc->setLabel(QObject::tr("Video on the desktop"));
     gc->setValue(false);
-    gc->setHelpText(QObject::tr("If checked, video will be displayed on the "
+    gc->setHelpText(QObject::tr("If enabled, video will be displayed on the "
                     "desktop, behind the Finder icons. Only valid when \"Use "
                     "GUI size for TV playback\" and \"Run the frontend in a "
                     "window\" are checked."));
Index: /usr/src/mythtv-trunk/mythtv/programs/mythfrontend/statusbox.cpp
===================================================================
--- /usr/src/mythtv-trunk/mythtv/programs/mythfrontend/statusbox.cpp	(revision 24387)
+++ /usr/src/mythtv-trunk/mythtv/programs/mythfrontend/statusbox.cpp	(working copy)
@@ -764,7 +764,7 @@
             fontstate = "warning";
         }
         else if (state == kState_WatchingLiveTV)
-            status = tr("is watching live TV");
+            status = tr("is watching Live TV");
         else if (state == kState_RecordingOnly ||
                  state == kState_WatchingRecording)
             status = tr("is recording");
@@ -975,7 +975,7 @@
                                         long long used, long long free,
                                         const recprof2bps_t& prof2bps)
 {
-    const QString tail = QObject::tr(", using your %1 rate of %2 Kb/sec");
+    const QString tail = QObject::tr(", using your %1 rate of %2 kb/s");
 
     out<<usage_str_kb(total, used, free);
     if (free<0)
Index: /usr/src/mythtv-trunk/mythtv/programs/mythtv-setup/backendsettings.cpp
===================================================================
--- /usr/src/mythtv-trunk/mythtv/programs/mythtv-setup/backendsettings.cpp	(revision 24387)
+++ /usr/src/mythtv-trunk/mythtv/programs/mythtv-setup/backendsettings.cpp	(working copy)
@@ -96,9 +96,9 @@
     gc->addSelection("None");
     gc->addSelection("PAL Teletext");
     gc->addSelection("NTSC Closed Caption");
-    gc->setHelpText(QObject::tr("VBI stands for Vertical Blanking Interrupt.  "
-                    "VBI is used to carry Teletext and Closed Captioning "
-                    "data."));
+    gc->setHelpText(QObject::tr("The VBI (Vertical Blanking Interval) is "
+                                "used to carry Teletext or Closed Captioning "
+                                "data."));
     return gc;
 };
 
@@ -121,7 +121,7 @@
     GlobalCheckBox *gc = new GlobalCheckBox("SaveTranscoding");
     gc->setLabel(QObject::tr("Save original files after transcoding (globally)"));
     gc->setValue(false);
-    gc->setHelpText(QObject::tr("When set and the transcoder is active, the "
+    gc->setHelpText(QObject::tr("If enabled and the transcoder is active, the "
                     "original files will be renamed to .old once the "
                     "transcoding is complete."));
     return gc;
@@ -133,9 +133,9 @@
     hc->setLabel(QObject::tr("Delete files slowly"));
     hc->setValue(false);
     hc->setHelpText(QObject::tr("Some filesystems use a lot of resources when "
-                    "deleting large recording files.  This option makes Myth "
-                    "delete the file slowly on this backend to lessen the "
-                    "impact."));
+                    "deleting large files.  If enabled, this option makes "
+                    "MythTV delete files slowly on this backend to "
+                    "lessen the impact."));
     return hc;
 };
 
@@ -144,7 +144,7 @@
     GlobalCheckBox *gc = new GlobalCheckBox("DeletesFollowLinks");
     gc->setLabel(QObject::tr("Follow symbolic links when deleting files"));
     gc->setValue(false);
-    gc->setHelpText(QObject::tr("This will cause Myth to follow symlinks "
+    gc->setHelpText(QObject::tr("If enabled, MythTV will follow symlinks "
                     "when recordings and related files are deleted, instead "
                     "of deleting the symlink and leaving the actual file."));
     return gc;
@@ -154,10 +154,10 @@
 {
     GlobalSpinBox *bs = new GlobalSpinBox(
         "HDRingbufferSize", 25*188, 512*188, 25*188);
-    bs->setLabel(QObject::tr("HD Ringbuffer size (KB)"));
+    bs->setLabel(QObject::tr("HD ringbuffer size (KB)"));
     bs->setHelpText(QObject::tr("The HD device ringbuffer allows the "
                     "backend to weather moments of stress. "
-                    "The larger the ringbuffer, the longer "
+                    "The larger the ringbuffer (in KB), the longer "
                     "the moments of stress can be. However, "
                     "setting the size too large can cause "
                     "swapping, which is detrimental."));
@@ -185,23 +185,22 @@
     GlobalCheckBox *gc = new GlobalCheckBox("DisableAutomaticBackup");
     gc->setLabel(QObject::tr("Disable Automatic Database Backup"));
     gc->setValue(false);
-    gc->setHelpText(QObject::tr("This will prevent Myth from backing up the "
-                                "database before upgrades.  If disabled, "
-                                "you should have your own backup strategy "
-                                "in place."));
+    gc->setHelpText(QObject::tr("If enabled, MythTV will not backup the "
+                                "database before upgrades. You should "
+                                "therefore have your own database backup "
+                                "strategy in place."));
     return gc;
 };
 
 static HostCheckBox *DisableFirewireReset()
 {
     HostCheckBox *hc = new HostCheckBox("DisableFirewireReset");
-    hc->setLabel(QObject::tr("Disable Firewire Reset"));
+    hc->setLabel(QObject::tr("Disable FireWire Reset"));
     hc->setHelpText(
         QObject::tr(
-            "By default MythTV will reset the firewire bus when a "
-            "firewire recorder stops responding to commands. But "
-            "if this causes problems you can disable this here for "
-            "Linux firewire recorders."));
+            "By default, MythTV resets the FireWire bus when a "
+            "FireWire recorder stops responding to commands. If "
+            "this causes problems, you can disable this behaviour here."));
     hc->setValue(false);
     return hc;
 }
@@ -305,11 +304,12 @@
 static GlobalSpinBox *EITTransportTimeout()
 {
     GlobalSpinBox *gc = new GlobalSpinBox("EITTransportTimeout", 1, 15, 1);
-    gc->setLabel(QObject::tr("EIT Transport Timeout (mins)"));
+    gc->setLabel(QObject::tr("EIT Transport Timeout (minutes)"));
     gc->setValue(5);
     QString helpText = QObject::tr(
-        "Maximum time to spend waiting for listings data on one DTV channel "
-        "before checking for new listings data on the next channel.");
+        "Maximum time to spend waiting (in minutes) for listings data "
+        "on one digital TV channel before checking for new listings data "
+        "on the next channel.");
     gc->setHelpText(helpText);
     return gc;
 }
@@ -355,7 +355,7 @@
 static GlobalSpinBox *WOLbackendReconnectWaitTime()
 {
     GlobalSpinBox *gc = new GlobalSpinBox("WOLbackendReconnectWaitTime", 0, 1200, 5);
-    gc->setLabel(QObject::tr("Delay between wake attempts (secs)"));
+    gc->setLabel(QObject::tr("Delay between wake attempts (seconds)"));
     gc->setValue(0);
     gc->setHelpText(QObject::tr("Length of time the frontend waits between "
                     "tries to wake up the master backend. This should be the "
@@ -380,7 +380,7 @@
     gc->setLabel(QObject::tr("Wake Command"));
     gc->setValue("");
     gc->setHelpText(QObject::tr("The command used to wake up your master "
-                    "backend server\n(eg. sudo /etc/init.d/mythtv-backend restart)."));
+                    "backend server\n(e.g. sudo /etc/init.d/mythtv-backend restart)."));
     return gc;
 };
 
@@ -431,9 +431,9 @@
 static GlobalSpinBox *idleTimeoutSecs()
 {
     GlobalSpinBox *gc = new GlobalSpinBox("idleTimeoutSecs", 0, 1200, 5);
-    gc->setLabel(QObject::tr("Idle shutdown timeout (secs)"));
+    gc->setLabel(QObject::tr("Idle shutdown timeout (seconds)"));
     gc->setValue(0);
-    gc->setHelpText(QObject::tr("The amount of time the master backend idles "
+    gc->setHelpText(QObject::tr("The number of seconds the master backend idles "
                     "before it shuts down all backends. Set to 0 to disable "
                     "auto shutdown."));
     return gc;
@@ -442,9 +442,9 @@
 static GlobalSpinBox *idleWaitForRecordingTime()
 {
     GlobalSpinBox *gc = new GlobalSpinBox("idleWaitForRecordingTime", 0, 120, 1);
-    gc->setLabel(QObject::tr("Max. wait for recording (min)"));
+    gc->setLabel(QObject::tr("Max. wait for recording (minutes)"));
     gc->setValue(15);
-    gc->setHelpText(QObject::tr("The amount of time the master backend waits "
+    gc->setHelpText(QObject::tr("The number of minutes the master backend waits "
                     "for a recording.  If it's idle but a recording starts "
                     "within this time period, the backends won't shut down."));
     return gc;
@@ -453,9 +453,9 @@
 static GlobalSpinBox *StartupSecsBeforeRecording()
 {
     GlobalSpinBox *gc = new GlobalSpinBox("StartupSecsBeforeRecording", 0, 1200, 5);
-    gc->setLabel(QObject::tr("Startup before rec. (secs)"));
+    gc->setLabel(QObject::tr("Startup before rec. (seconds)"));
     gc->setValue(120);
-    gc->setHelpText(QObject::tr("The amount of time the master backend will be "
+    gc->setHelpText(QObject::tr("The number of seconds the master backend will be "
                     "woken up before a recording starts."));
     return gc;
 };
@@ -509,7 +509,7 @@
     GlobalCheckBox *gc = new GlobalCheckBox("blockSDWUwithoutClient");
     gc->setLabel(QObject::tr("Block shutdown before client connected"));
     gc->setValue(true);
-    gc->setHelpText(QObject::tr("If set, the automatic shutdown routine will "
+    gc->setHelpText(QObject::tr("If enabled, the automatic shutdown routine will "
                     "be disabled until a client connects."));
     return gc;
 };
@@ -539,9 +539,9 @@
 static HostSpinBox *JobQueueCheckFrequency()
 {
     HostSpinBox *gc = new HostSpinBox("JobQueueCheckFrequency", 5, 300, 5);
-    gc->setLabel(QObject::tr("Job Queue Check frequency (in seconds)"));
+    gc->setLabel(QObject::tr("Job Queue Check frequency (seconds)"));
     gc->setHelpText(QObject::tr("When looking for new jobs to process, the "
-                    "Job Queue will wait this long between checks."));
+                    "Job Queue will wait this many seconds between checks."));
     gc->setValue(60);
     return gc;
 };
@@ -585,7 +585,7 @@
     GlobalCheckBox *gc = new GlobalCheckBox("JobsRunOnRecordHost");
     gc->setLabel(QObject::tr("Run Jobs only on original recording backend"));
     gc->setValue(false);
-    gc->setHelpText(QObject::tr("If set, jobs in the queue will be required "
+    gc->setHelpText(QObject::tr("If enabled, jobs in the queue will be required "
                                 "to run on the backend that made the "
                                 "original recording."));
     return gc;
@@ -596,9 +596,9 @@
     GlobalCheckBox *gc = new GlobalCheckBox("AutoTranscodeBeforeAutoCommflag");
     gc->setLabel(QObject::tr("Run Transcode Jobs before Auto-Commercial Flagging"));
     gc->setValue(false);
-    gc->setHelpText(QObject::tr("If set, if both auto-transcode and "
+    gc->setHelpText(QObject::tr("If enabled, and if both auto-transcode and "
                                 "auto commercial flagging are turned ON for a "
-                                "recording, transcoding will run first, "
+                                "recording, transcoding will run first; "
                                 "otherwise, commercial flagging runs first."));
     return gc;
 };
@@ -609,7 +609,7 @@
     gc->setLabel(QObject::tr("Start Auto-Commercial Flagging jobs when the "
                              "recording starts"));
     gc->setValue(false);
-    gc->setHelpText(QObject::tr("If set and Auto Commercial Flagging is ON for "
+    gc->setHelpText(QObject::tr("If enabled, and Auto Commercial Flagging is ON for "
                                 "a recording, the flagging job will be started "
                                 "as soon as the recording starts.  NOT "
                                 "recommended on underpowered systems."));
@@ -641,8 +641,8 @@
     HostCheckBox *gc = new HostCheckBox("JobAllowCommFlag");
     gc->setLabel(QObject::tr("Allow Commercial Detection jobs"));
     gc->setValue(true);
-    gc->setHelpText(QObject::tr("Allow jobs of this type to run on this "
-                                "backend."));
+    gc->setHelpText(QObject::tr("If enabled, allow jobs of this type to "
+                                "run on this backend."));
     return gc;
 };
 
@@ -651,8 +651,8 @@
     HostCheckBox *gc = new HostCheckBox("JobAllowTranscode");
     gc->setLabel(QObject::tr("Allow Transcoding jobs"));
     gc->setValue(true);
-    gc->setHelpText(QObject::tr("Allow jobs of this type to run on this "
-                                "backend."));
+    gc->setHelpText(QObject::tr("If enabled, allow jobs of this type to "
+                                "run on this backend."));
     return gc;
 };
 
@@ -693,8 +693,8 @@
     // if (QString(gContext->GetSetting(QString("UserJob%1").arg(job_num)))
     //            .length() == 0)
     //     bc->setEnabled(false);
-    bc->setHelpText(QObject::tr("Allow jobs of this type to run on this "
-                    "backend."));
+    bc->setHelpText(QObject::tr("If enabled, allow jobs of this type to "
+                    "run on this backend."));
     return bc;
 }
 
@@ -715,9 +715,9 @@
 static HostSpinBox *UPNPRebuildDelay()
 {
     HostSpinBox *gc = new HostSpinBox("UPnP/RebuildDelay", 0, 1440, 1);
-    gc->setLabel(QObject::tr("Upnp Media Update Time"));
+    gc->setLabel(QObject::tr("UPnP Media Update Time"));
     gc->setHelpText(QObject::tr("The number of minutes between mythbackend "
-                                "checking for new videos to serve via upnp. "
+                                "checking for new videos to serve via UPnP. "
                                 "0 = Off. "));
     gc->setValue(30);
     return gc;
@@ -764,16 +764,16 @@
     HostCheckBox *gc = new HostCheckBox("LogCleanEnabled");
     gc->setLabel(QObject::tr("Automatic Log Cleaning Enabled"));
     gc->setValue(false);
-    gc->setHelpText(QObject::tr("This enables the periodic cleanup of the "
-                    "events stored in the Myth database (see \"Log MythTV "
-                    "events to database\")."));
+    gc->setHelpText(QObject::tr("If enabled, a periodic cleanup of the "
+                    "events stored in the MythTV database occurs (see \"Log "
+                    "MythTV events to database\")."));
     return gc;
 }
 
 static HostSpinBox *LogCleanPeriod()
 {
     HostSpinBox *gs = new HostSpinBox("LogCleanPeriod", 0, 60, 1);
-    gs->setLabel(QObject::tr("Log Cleanup Frequency (Days)"));
+    gs->setLabel(QObject::tr("Log Cleanup Frequency (days)"));
     gs->setValue(14);
     gs->setHelpText(QObject::tr("The number of days between log cleanup runs."));
     return gs;
@@ -827,15 +827,15 @@
     GlobalCheckBox *bc = new GlobalCheckBox("MythFillEnabled");
     bc->setLabel(QObject::tr("Automatically run mythfilldatabase"));
     bc->setValue(true);
-    bc->setHelpText(QObject::tr("This enables the automatic execution of "
-                    "mythfilldatabase."));
+    bc->setHelpText(QObject::tr("If enabled, execution of "
+                    "mythfilldatabase occurs automatically."));
     return bc;
 }
 
 static GlobalSpinBox *MythFillPeriod()
 {
     GlobalSpinBox *bs = new GlobalSpinBox("MythFillPeriod", 1, 30, 1);
-    bs->setLabel(QObject::tr("mythfilldatabase Run Frequency (Days)"));
+    bs->setLabel(QObject::tr("mythfilldatabase Run Frequency (days)"));
     bs->setValue(1);
     bs->setHelpText(QObject::tr("The number of days between mythfilldatabase "
                     "runs."));
@@ -874,11 +874,10 @@
     bc->setLabel(QObject::tr("Run mythfilldatabase at time suggested by the "
                              "grabber."));
     bc->setValue(true);
-    bc->setHelpText(QObject::tr("This setting allows a DataDirect guide data "
+    bc->setHelpText(QObject::tr("If enabled, allow a DataDirect guide data "
                     "provider to specify the next download time in order to "
-                    "distribute load on their servers. If this setting is "
-                    "enabled, mythfilldatabase Execution Start/End times are "
-                    "ignored."));
+                    "distribute load on their servers. mythfilldatabase "
+                    "Execution Start/End times are also ignored."));
     return bc;
 }
 
@@ -920,7 +919,7 @@
   public:
     MythLogSettings() : TriggeredConfigurationGroup(false, true, false, false)
     {
-         setLabel(QObject::tr("Myth Database Logging"));
+         setLabel(QObject::tr("MythTV Database Logging"));
 //         setUseLabel(false);
 
          Setting* logEnabled = LogEnabled();
@@ -1118,7 +1117,7 @@
     addChild(group7);
 
     VerticalConfigurationGroup* group8 = new VerticalConfigurationGroup(false);
-    group8->setLabel(QObject::tr("UPNP Server Settings"));
+    group8->setLabel(QObject::tr("UPnP Server Settings"));
     //group8->addChild(UPNPShowRecordingUnderVideos());
     group8->addChild(UPNPWmpSource());
     group8->addChild(UPNPRebuildDelay());
Index: /usr/src/mythtv-trunk/mythtv/programs/mythtv-setup/channeleditor.cpp
===================================================================
--- /usr/src/mythtv-trunk/mythtv/programs/mythtv-setup/channeleditor.cpp	(revision 24387)
+++ /usr/src/mythtv-trunk/mythtv/programs/mythtv-setup/channeleditor.cpp	(working copy)
@@ -599,8 +599,8 @@
     {
         menu->SetReturnEvent(this, "iconimportopt");
 
-        menu->AddButton(tr("Download all icons.."));
-        menu->AddButton(tr("Rescan for missing icons.."));
+        menu->AddButton(tr("Download all icons..."));
+        menu->AddButton(tr("Rescan for missing icons..."));
         if (!channelname.isEmpty())
             menu->AddButton(tr("Download icon for %1").arg(channelname),
                             channelname);
Index: /usr/src/mythtv-trunk/mythtv/programs/mythwelcome/welcomedialog.cpp
===================================================================
--- /usr/src/mythtv-trunk/mythtv/programs/mythwelcome/welcomedialog.cpp	(revision 24387)
+++ /usr/src/mythtv-trunk/mythtv/programs/mythwelcome/welcomedialog.cpp	(working copy)
@@ -410,7 +410,7 @@
 
     // update status message
     if (m_statusList.empty())
-        status = tr("Please Wait ...");
+        status = tr("Please Wait...");
     else
     {
         if ((int)m_statusListNo >= m_statusList.count())
Index: /usr/src/mythtv-trunk/mythtv/programs/mythwelcome/welcomesettings.cpp
===================================================================
--- /usr/src/mythtv-trunk/mythtv/programs/mythwelcome/welcomesettings.cpp	(revision 24387)
+++ /usr/src/mythtv-trunk/mythtv/programs/mythwelcome/welcomesettings.cpp	(working copy)
@@ -56,9 +56,9 @@
 static HostCheckBox *AutoStartFrontend()
 {
     HostCheckBox *gc = new HostCheckBox("AutoStartFrontend");
-    gc->setLabel(QObject::tr("Automatically Start Myth Frontend"));
+    gc->setLabel(QObject::tr("Automatically Start mythfrontend"));
     gc->setValue(true);
-    gc->setHelpText(QObject::tr("Mythwelcome will automatically start the "
+    gc->setHelpText(QObject::tr("Mythwelcome will automatically start "
                     "mythfrontend if it is determined that it was not started to "
                     "record a program."));
     return gc;