Ticket #8928: string_corrections.diff

mythplugins/mythweb/INSTALL

@@ -184 +184 @@
 =============
 
 As of 0.21, MythWeb contains configuration files for both Apache and Lighty.
-You will need to chose ONE of these files and install it in your webserver's
+You will need to choose ONE of these files and install it in your webserver's
 configuration directory.  This will be explained later.
 
 The first thing you must do is find the configuration file for your chosen

mythtv/themes/classic/main_settings.xml

@@ -18 +18 @@
     <button>
         <type>SETTINGS_THEMECHOOSER</type>
         <text>Theme Chooser</text>
-        <description>Chose a local theme or download new ones</description>
+        <description>Choose a local theme or download new ones</description>
         <action>SETTINGS THEMECHOOSER</action>
     </button>
 

mythtv/themes/DVR/main_settings.xml

@@ -18 +18 @@
     <button>
         <type>SETTINGS_THEMECHOOSER</type>
         <text>Theme Chooser</text>
-        <description>Chose a local theme or download new ones</description>
+        <description>Choose a local theme or download new ones</description>
         <action>SETTINGS THEMECHOOSER</action>
     </button>
 

mythtv/themes/mediacentermenu/main_settings.xml

@@ -18 +18 @@
     <button>
         <type>SETTINGS_THEMECHOOSER</type>
         <text>Theme Chooser</text>
-        <description>Chose a local theme or download new ones</description>
+        <description>Choose a local theme or download new ones</description>
         <action>SETTINGS THEMECHOOSER</action>
     </button>
 

mythtv/themes/defaultmenu/main_settings.xml

@@ -18 +18 @@
     <button>
         <type>SETTINGS_THEMECHOOSER</type>
         <text>Theme Chooser</text>
-        <description>Chose a local theme or download new ones</description>
+        <description>Choose a local theme or download new ones</description>
         <action>SETTINGS THEMECHOOSER</action>
     </button>
 

mythtv/libs/libmythtv/channelscan/modulationsetting.h

@@ -100 +100 @@
         setLabel(QObject::tr("Modulation"));
         setHelpText(
             QObject::tr("Modulation, QPSK, 8PSK, QAM-16") + " " +
-            QObject::tr("Most DVB-S transponders use QPSK, DVB-S2 8PSK "
-                        "QAM-16 is not available for DVB-S2 transports."));
+            QObject::tr("Most DVB-S transponders use QPSK, while "
+                        "DVB-S2 use 8PSK. QAM-16 is not available "
+                        "for DVB-S2 transports."));
     }
 };
 

mythtv/libs/libmythtv/channelscan/channelscanmiscsettings.h

@@ -86 +86 @@
                         "TV - Adds A/V services only, "
                         "TV+Radio - Adds all services with audio, "
                         "All - Adds all services "
-                        "(including data only serices)."));
+                        "(including data only services)."));
         addSelection(QObject::tr("TV"),       "tv", true);
         addSelection(QObject::tr("TV+Radio"), "audio");
         addSelection(QObject::tr("All"),      "all");

mythtv/libs/libmythtv/videosource.cpp

@@ -1036 +1036 @@
         ComboBoxSetting(this),
         CaptureCardDBStorage(this, parent, "audioratelimit")
     {
-        setLabel(QObject::tr("Audio sampling rate limit"));
+        setLabel(QObject::tr("Force audio sampling rate"));
         setHelpText(
             QObject::tr("If non-zero, override the audio sampling "
                         "rate in the recording profile when this card is "

mythtv/programs/mythfrontend/globalsettings.cpp

@@ -126 +126 @@
         // Rescan button
     TransButtonSetting *rescan = new TransButtonSetting("rescan");
     rescan->setLabel(QObject::tr("Scan for audio devices"));
-    rescan->setHelpText(QObject::tr("Scan for the available audio devices "
-                                    "available. Custom entry will be scanned "
-                                    "and capability entries populated."));
+    rescan->setHelpText(QObject::tr("Scan for available audio devices. "
+                                    "Custom entry will be scanned and "
+                                    "capability entries populated."));
     addChild(rescan);
     connect(rescan, SIGNAL(pressed()), this, SLOT(AudioRescan()));