From 158de95460c958b62bb4f3d7cda96ace7b97c8e9 Mon Sep 17 00:00:00 2001
From: "Michael T. Dean" <mdean@mythtv.org>
Date: Tue, 19 Jul 2011 18:11:54 -0400
Subject: [PATCH] Update strings in HTTP setup.

This continues the backporting the mythtv-setup string changes to HTTP
setup started in f9ccf75fe3eb3837f26f9c7bc8c72273fea9b977 .  As well as
backporting string changes from mythtv-setup to HTTP setup, this
includes some forward-ported string changes for mythfilldatabase
settings, moving the updated strings from HTTP setup to mythtv-setup.

In addition, this removes the UPnP/RebuildDelay setting, which has been
a dead setting widget since the UPnP Video Scanner was removed in
e3b63db691422f3116c10bb0bff61b5d89c833a1 .  (There is no longer a UPnP
rebuild, so no need to specify a rebuild delay.)

Also changed 2 occurrences of, "Set to 0 to disable," to "Set to
'Disabled' to disable," in the HTTP setup program, where the 0 option is
labeled 'Disabled'.  I considered just removing it, but thought it might
be useful to alert the user that it can be disabled (since the combo box
will only show the currently selected value).  Apologies to translators,
who will now have to translate 2 basically equivalent strings for these
settings.
---
 .../mythbackend/config_backend_general.xml    | 86 ++++++++-----------
 .../programs/mythtv-setup/backendsettings.cpp | 70 +++++++--------
 2 files changed, 64 insertions(+), 92 deletions(-)

diff --git a/mythtv/programs/mythbackend/config_backend_general.xml b/mythtv/programs/mythbackend/config_backend_general.xml
index 540e1fb705d..b4043ceaf37 100644
--- a/mythtv/programs/mythbackend/config_backend_general.xml
+++ b/mythtv/programs/mythbackend/config_backend_general.xml
@@ -68,8 +68,8 @@
                           used to carry Teletext or Closed Captioning data."
                data_type="select">
         <option display="None" data="none" />
-        <option display="PAL Teletext" data="pal" />
-        <option display="NTSC Closed Caption" data="ntsc" />
+        <option display="PAL teletext" data="pal" />
+        <option display="NTSC closed caption" data="ntsc" />
       </setting>
       <setting value="FreqTable" default_data="us-cable"
                setting_type="global" label="Channel frequency table"
@@ -185,10 +185,10 @@
                       directories. 'Balanced Free Space' is the recommended
                       method for most users."
            data_type="select">
-          <option display="Balanced Free Space" data="BalancedFreeSpace" />
-          <option display="Balanced Disk I/O" data="BalancedDiskIO" />
+          <option display="Balanced free space" data="BalancedFreeSpace" />
           <option display="Balanced percent free space"
                   data="BalancedPercFreeSpace" />
+          <option display="Balanced disk I/O" data="BalancedDiskIO" />
           <option display="Combination" data="Combination" />
         </setting>
       </group>
@@ -272,7 +272,7 @@
                setting_type="global"
                help_text="The amount of time the master backend idles
                          before it shuts down all other backends. Set
-                         to 0 to disable automatic shutdown.">
+                         to 'Disabled' to disable automatic shutdown.">
         <option display="Disabled" data="0" />
         <option display="5" data="5" />
         <option display="15" data="15" />
@@ -288,8 +288,8 @@
                default_data="15"
                setting_type="global"
                help_text="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
+                          for a recording. If the backend is idle but a
+                          recording starts within this time period, it
                           won't shut down.">
         <option display="5" data="5" />
         <option display="15" data="15" />
@@ -357,7 +357,7 @@
                  help_text="Length of time the frontend waits between
                             tries to wake up the master backend. This should
                             be the time your master backend needs to startup.
-                            Set to 0 to disable.">
+                            Set to 'Disabled' to disable.">
           <option display="Disabled" data="0" />
           <option display="1" data="1" />
           <option display="2" data="2" />
@@ -645,41 +645,22 @@
            unique_label="upnp_server_settings">
 <!--
       <setting data_type="checkbox" value="UPnP/RecordingsUnderVideos"
-               label="Include Recordings in Video List" default_data="0"
+               label="Include recordings in video list" default_data="0"
                setting_type="global"
                help_text="If enabled, the master backend will include the
-                          list of recorded shows in the list of videos
-                          This is mainly to accommodate UPnP players which do not
-                          allow more than 1 video section."  />
+                          list of recorded shows in the list of videos.
+                          This is mainly to accommodate UPnP players which
+                          do not allow more than 1 video section."  />
 -->
       <setting data_type="select" value="UPnP/WMPSource"
-               label="Video content to show a WMP Client"
+               label="Video content to show a WMP client"
                default_data="0"
                setting_type="global"
-               help_text="This forces us to show WMP clients
-                          either the Recordings tree or the Video tree
-                          when they request a list of videos ">
+               help_text="Which tree to show a Windows Media Player
+                          client when it requests a list of videos.">
         <option display="Recordings" data="0" />
         <option display="Videos" data="1" />
       </setting>
-      <setting data_type="select" value="UPnP/RebuildDelay"
-               label="UPnP Media Update Time"
-               setting_type="host"
-               help_text="The number of minutes between mythbackend checking
-                          for new videos to serve via upnp. 0 = Off. "
-               default_data="30">
-                <option display="30" data="30" />
-        <option display="Off" data="0" />
-        <option display="1" data="1" />
-        <option display="5" data="5" />
-        <option display="15" data="15" />
-        <option display="30" data="30" />
-        <option display="60" data="60" />
-        <option display="120" data="120" />
-        <option display="300" data="300" />
-        <option display="600" data="600" />
-        <option display="1440" data="1440" />
-      </setting>
     </group>
     <group human_label="Program Schedule Downloading Options"
            unique_label="program_schedule_downloading_options">
@@ -687,11 +668,11 @@
                label="Automatically update program listings"
                default_data="1"
                setting_type="global"
-               help_text="This enables the automatic execution of
-                          mythfilldatabase." />
+               help_text="If enabled, the guide data program will be
+                          run automatically." />
       <setting data_type="string" value="MythFillDatabasePath"
                setting_type="global"
-               label="Guide Data Program"
+               label="Guide data program"
                default_data="mythfilldatabase"
                placeholder_text="Enter guide data command"
                help_text="Use 'mythfilldatabase' or the name of a custom
@@ -699,27 +680,29 @@
                           for all your video sources." />
       <setting data_type="string" value="MythFillDatabaseArgs"
                setting_type="global"
-               label="Guide Data Arguments"
+               label="Guide data arguments"
                default_data=""
                placeholder_text="Enter guide data program arguments"
                help_text="Any arguments you want passed to the
                           guide data program." />
       <setting data_type="string" value="MythFillDatabaseLog"
                setting_type="global"
-               label="Guide Data Program Log Path"
+               label="Guide data program log path"
                default_data=""
                placeholder_text="Enter guide data program log path"
                help_text="File or directory to use for logging
-                          output from the mythfilldatabase program.
+                          output from the guide data  program.
                           Leave blank to disable logging." />
 
       <setting data_type="select" value="MythFillMinHour"
-               label="mythfilldatabase Execution Start"
+               label="Guide data program execution start"
                default_data="0"
                setting_type="global"
                help_text="This setting and the following one define a
-                          time period when the mythfilldatabase process is
-                          allowed to run.">
+                          time period when the guide data program is allowed
+                          to run. For example, setting start to 11 and
+                          end to 13 would mean that the program would only
+                          run between 11:00 AM and 1:59 PM.">
         <option display="12 AM" data="0" />
         <option display="1 AM"  data="1" />
         <option display="2 AM"  data="2" />
@@ -747,12 +730,14 @@
       </setting>
 
       <setting data_type="select" value="MythFillMaxHour"
-               label="mythfilldatabase Execution End"
+               label="Guide data program execution end"
                default_data="23"
                setting_type="global"
                help_text="This setting and the preceding one define a
-                          time period when the mythfilldatabase process is
-                          allowed to run.">
+                          time period when the guide data program is allowed
+                          to run. For example, setting start to 11 and
+                          end to 13 would mean that the program would only
+                          run between 11:00 AM and 1:59 PM.">
         <option display="12 AM" data="0" />
         <option display="1 AM"  data="1" />
         <option display="2 AM"  data="2" />
@@ -779,14 +764,13 @@
         <option display="11 PM" data="23" />
       </setting>
       <setting data_type="checkbox" value="MythFillGrabberSuggestsTime"
-               label="Run mythfilldatabase at time suggested by the grabber."
+               label="Run guide data program at time suggested by the grabber."
                default_data="1"
                setting_type="global"
-               help_text="This setting allows a DataDirect guide data provider
+               help_text="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. Guide data program
+                          execution start/end times are also ignored." />
     </group>
     <group human_label="System Events"
            unique_label="system_events">
diff --git a/mythtv/programs/mythtv-setup/backendsettings.cpp b/mythtv/programs/mythtv-setup/backendsettings.cpp
index 2b8fbe036b2..9d8dfbb184c 100644
--- a/mythtv/programs/mythtv-setup/backendsettings.cpp
+++ b/mythtv/programs/mythtv-setup/backendsettings.cpp
@@ -94,8 +94,8 @@ static GlobalComboBox *VbiFormat()
     GlobalComboBox *gc = new GlobalComboBox("VbiFormat");
     gc->setLabel(QObject::tr("VBI format"));
     gc->addSelection("None");
-    gc->addSelection("PAL Teletext");
-    gc->addSelection("NTSC Closed Caption");
+    gc->addSelection("PAL teletext");
+    gc->addSelection("NTSC closed caption");
     gc->setHelpText(QObject::tr("The VBI (Vertical Blanking Interval) is "
                     "used to carry Teletext or Closed Captioning "
                     "data."));
@@ -433,8 +433,8 @@ static GlobalSpinBox *idleWaitForRecordingTime()
     gc->setLabel(QObject::tr("Maximum wait for recording (mins)"));
     gc->setValue(15);
     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 "
+                    "waits for a recording. If the backend is idle but a "
+                    "recording starts within this time period, it won't "
                     "shut down."));
     return gc;
 };
@@ -705,55 +705,44 @@ static GlobalCheckBox *UPNPShowRecordingUnderVideos()
     gc->setLabel(QObject::tr("Include recordings in video list"));
     gc->setValue(false);
     gc->setHelpText(QObject::tr("If enabled, the master backend will include"
-                    " the list of recorded shows in the list of videos "
+                    " the list of recorded shows in the list of videos. "
                     " This is mainly to accommodate UPnP players which do not"
                     " allow more than 1 video section." ));
     return gc;
 };
 #endif
 
-static HostSpinBox *UPNPRebuildDelay()
-{
-    HostSpinBox *gc = new HostSpinBox("UPnP/RebuildDelay", 0, 1440, 1);
-    gc->setLabel(QObject::tr("UPnP media update time"));
-    gc->setHelpText(QObject::tr("How often (in minutes) MythTV will check "
-                    "for new videos to serve via UPnP. "
-                    "0 = Off. "));
-    gc->setValue(30);
-    return gc;
-};
-
 static GlobalComboBox *UPNPWmpSource()
 {
     GlobalComboBox *gc = new GlobalComboBox("UPnP/WMPSource");
-    gc->setLabel(QObject::tr("Video content to show a WMP client"));
+    gc->setLabel(QObject::tr("Video content to show a WMP cient"));
     gc->addSelection(QObject::tr("Recordings"),"0");
     gc->addSelection(QObject::tr("Videos"),"1");
     gc->setValue("0");
-    gc->setHelpText(QObject::tr("Which tree to show a Windows Media Player client "
-                    "when it requests a list of videos."));
+    gc->setHelpText(QObject::tr("Which tree to show a Windows Media Player "
+                    "client when it requests a list of videos."));
     return gc;
 };
 
 static GlobalCheckBox *MythFillEnabled()
 {
     GlobalCheckBox *bc = new GlobalCheckBox("MythFillEnabled");
-    bc->setLabel(QObject::tr("Automatically run mythfilldatabase"));
+    bc->setLabel(QObject::tr("Automatically update program listings"));
     bc->setValue(true);
-    bc->setHelpText(QObject::tr("If enabled, execution of "
-                    "mythfilldatabase occurs automatically."));
+    bc->setHelpText(QObject::tr("If enabled, the guide data program "
+                                "will be run automatically."));
     return bc;
 }
 
 static GlobalSpinBox *MythFillMinHour()
 {
     GlobalSpinBox *bs = new GlobalSpinBox("MythFillMinHour", 0, 23, 1);
-    bs->setLabel(QObject::tr("mythfilldatabase execution start"));
+    bs->setLabel(QObject::tr("Guide data program execution start"));
     bs->setValue(0);
     bs->setHelpText(QObject::tr("This setting and the following one define a "
-                    "time period when the mythfilldatabase process is "
-                    "allowed to run. For example, setting start to 11 and "
-                    "end to 13 would mean that the process would only "
+                    "time period when the guide data program is allowed "
+                    "to run. For example, setting start to 11 and "
+                    "end to 13 would mean that the program would only "
                     "run between 11:00 AM and 1:59 PM."));
     return bs;
 }
@@ -761,12 +750,12 @@ static GlobalSpinBox *MythFillMinHour()
 static GlobalSpinBox *MythFillMaxHour()
 {
     GlobalSpinBox *bs = new GlobalSpinBox("MythFillMaxHour", 0, 23, 1);
-    bs->setLabel(QObject::tr("mythfilldatabase execution end"));
+    bs->setLabel(QObject::tr("Guide data program execution end"));
     bs->setValue(23);
     bs->setHelpText(QObject::tr("This setting and the preceding one define a "
-                    "time period when the mythfilldatabase process is "
-                    "allowed to run. For example, setting start to 11 and "
-                    "end to 13 would mean that the process would only "
+                    "time period when the guide data program is allowed "
+                    "to run. For example, setting start to 11 and "
+                    "end to 13 would mean that the program would only "
                     "run between 11:00 AM and 1:59 PM."));
     return bs;
 }
@@ -774,20 +763,20 @@ static GlobalSpinBox *MythFillMaxHour()
 static GlobalCheckBox *MythFillGrabberSuggestsTime()
 {
     GlobalCheckBox *bc = new GlobalCheckBox("MythFillGrabberSuggestsTime");
-    bc->setLabel(QObject::tr("Run mythfilldatabase at time suggested by the "
+    bc->setLabel(QObject::tr("Run guide data program at time suggested by the "
                              "grabber."));
     bc->setValue(true);
     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. mythfilldatabase "
-                    "Execution Start/End times are also ignored."));
+                    "provider to specify the next download time in order "
+                    "to distribute load on their servers. Guide data program "
+                    "execution start/end times are also ignored."));
     return bc;
 }
 
 static GlobalLineEdit *MythFillDatabasePath()
 {
     GlobalLineEdit *be = new GlobalLineEdit("MythFillDatabasePath");
-    be->setLabel(QObject::tr("mythfilldatabase program"));
+    be->setLabel(QObject::tr("Guide data program"));
     be->setValue("mythfilldatabase");
     be->setHelpText(QObject::tr(
                         "Use 'mythfilldatabase' or the name of a custom "
@@ -799,20 +788,20 @@ static GlobalLineEdit *MythFillDatabasePath()
 static GlobalLineEdit *MythFillDatabaseArgs()
 {
     GlobalLineEdit *be = new GlobalLineEdit("MythFillDatabaseArgs");
-    be->setLabel(QObject::tr("mythfilldatabase arguments"));
+    be->setLabel(QObject::tr("Guide data arguments"));
     be->setValue("");
     be->setHelpText(QObject::tr("Any arguments you want passed to the "
-                    "mythfilldatabase program. See mythfilldatabase --help"));
+                                "guide data program."));
     return be;
 }
 
 static GlobalLineEdit *MythFillDatabaseLog()
 {
     GlobalLineEdit *be = new GlobalLineEdit("MythFillDatabaseLog");
-    be->setLabel(QObject::tr("mythfilldatabase log path"));
+    be->setLabel(QObject::tr("Guide data program log path"));
     be->setValue("");
     be->setHelpText(QObject::tr("File or directory to use for logging "
-                    "output from the mythfilldatabase program. Leave blank "
+                    "output from the guide data program. Leave blank "
                     "to disable logging."));
     return be;
 }
@@ -823,7 +812,7 @@ class MythFillSettings : public TriggeredConfigurationGroup
      MythFillSettings() :
          TriggeredConfigurationGroup(false, true, false, false)
      {
-         setLabel(QObject::tr("Mythfilldatabase"));
+         setLabel(QObject::tr("Program Schedule Downloading Options"));
          setUseLabel(false);
 
          Setting* fillEnabled = MythFillEnabled();
@@ -996,7 +985,6 @@ BackendSettings::BackendSettings() {
     group8->setLabel(QObject::tr("UPnP Server Settings"));
     //group8->addChild(UPNPShowRecordingUnderVideos());
     group8->addChild(UPNPWmpSource());
-    group8->addChild(UPNPRebuildDelay());
     addChild(group8);
 
     MythFillSettings *mythfill = new MythFillSettings();