diff options
Diffstat (limited to 'abs/core/mythinstall/installsettings.cpp.patch')
| -rw-r--r-- | abs/core/mythinstall/installsettings.cpp.patch | 532 |
1 files changed, 532 insertions, 0 deletions
diff --git a/abs/core/mythinstall/installsettings.cpp.patch b/abs/core/mythinstall/installsettings.cpp.patch new file mode 100644 index 0000000..461d26d --- /dev/null +++ b/abs/core/mythinstall/installsettings.cpp.patch @@ -0,0 +1,532 @@ +--- installsettings.cpp.orig 2013-12-06 17:34:15.794137303 +0000 ++++ installsettings.cpp 2013-12-07 17:31:13.642325676 +0000 +@@ -67,7 +67,7 @@ + HostLineEdit *gc = new HostLineEdit("HostDDnslogin"); + gc->setLabel(QObject::tr("Login")); + gc->setValue(""); +- gc->setHelpText(QObject::tr("Login for ddns account")); ++ gc->setHelpText(QObject::tr("Login for DDNS account.")); + return gc; + }; + +@@ -77,7 +77,7 @@ + gc->setLabel(QObject::tr("Password")); + gc->setValue(""); + gc->SetPasswordEcho(true); +- gc->setHelpText(QObject::tr("Password for ddns account.")); ++ gc->setHelpText(QObject::tr("Password for DDNS account.")); + return gc; + }; + +@@ -93,7 +93,7 @@ + static HostCheckBox *HostDDnsEnable() + { + HostCheckBox *gc = new HostCheckBox("HostDDnsEnable"); +- gc->setLabel(QObject::tr("Enable DDNS support")); ++ gc->setLabel(QObject::tr("Enable DDNS")); + gc->setValue(false); + gc->setHelpText(QObject::tr("Update DDNS records at dyndns.com. Visit http://dyndns.com to setup your account.")); + return gc; +@@ -103,7 +103,7 @@ + public: + DDnssettings(): + TriggeredConfigurationGroup(false,false,false,false) { +- setLabel(QObject::tr("DDNS settings")); ++ setLabel(QObject::tr("DDNS Settings")); + SetVertical(true); + Setting* trigger = HostDDnsEnable() ; + addChild(trigger); +@@ -321,9 +321,9 @@ + static HostCheckBox *HostBEWait() + { + HostCheckBox *gc = new HostCheckBox("HostBEWait"); +- gc->setLabel(QObject::tr("Delay starting the frontend until the server is ready")); ++ gc->setLabel(QObject::tr("Delay starting mythfrontend until mythbackend is running")); + gc->setValue(true); +- gc->setHelpText(QObject::tr("The system will check if the backend is online before starting mythfrontend. This is useful to avoid unwanted connection errors or configuration screens. ")); ++ gc->setHelpText(QObject::tr("The system will check if mythbackend is online before starting mythfrontend. This will avoid connection errors and configuration screens.")); + return gc; + }; + +@@ -370,9 +370,9 @@ + static HostCheckBox *HostServiceMythWEB() + { + HostCheckBox *gc = new HostCheckBox("HostServiceMythWEB"); +- gc->setLabel(QObject::tr("Enable Mythweb")); ++ gc->setLabel(QObject::tr("Enable MythWeb")); + gc->setValue(false); +- gc->setHelpText(QObject::tr("Allow scheduling using a web browser")); ++ gc->setHelpText(QObject::tr("Allow MythTV scheduling using a web browser.")); + return gc; + }; + +@@ -416,9 +416,9 @@ + static HostCheckBox *HostRunDHCP() + { + HostCheckBox *gc = new HostCheckBox("HostRunDHCP"); +- gc->setLabel(QObject::tr("DHCP server")); ++ gc->setLabel(QObject::tr("DHCP Server")); + gc->setValue(false); +- gc->setHelpText(QObject::tr("Only one dhcp server should run on a network. Leave this unchecked if your unsure.")); ++ gc->setHelpText(QObject::tr("Only one DHCP server should run on a network. Leave this unchecked if you are not sure.")); + return gc; + }; + +@@ -436,16 +436,16 @@ + HostCheckBox *gc = new HostCheckBox("HostUseMythWelcome"); + gc->setLabel(QObject::tr("Run MythWelcome")); + gc->setValue(false); +- gc->setHelpText(QObject::tr("If this option is checked mythwelcome will be started first.")); ++ gc->setHelpText(QObject::tr("If checked mythwelcome will be started instead of mythfrontend.")); + return gc; + }; + + static HostCheckBox *HostRunFrontend() + { + HostCheckBox *gc = new HostCheckBox("HostRunFrontend"); +- gc->setLabel(QObject::tr("Run the Frontend.")); ++ gc->setLabel(QObject::tr("Run Frontend")); + gc->setValue(true); +- gc->setHelpText(QObject::tr("When checked the frontend will start. Most people will want this checked.")); ++ gc->setHelpText(QObject::tr("If checked the frontend X windows GUI will start. Most people will want this checked. Disable the frontend if you want the system to run without a display connected.")); + return gc; + }; + +@@ -500,7 +500,7 @@ + HostCheckBox *gc = new HostCheckBox("HostRemoteBackup"); + gc->setLabel(QObject::tr("Remote Backup")); + gc->setValue(false); +- gc->setHelpText(QObject::tr("Copy the system backup file to another dir or host. Supplemental services must be installed to copy the file to a remote host.")); ++ gc->setHelpText(QObject::tr("Copy the system backup file to another directory or host.")); + return gc; + }; + +@@ -509,7 +509,7 @@ + { + QString tempItem; + HostComboBox *gc = new HostComboBox("HostRemoteBackupDir",true); +- gc->setLabel(QObject::tr("dir or host" )); ++ gc->setLabel(QObject::tr(" Dir or Host" )); + gc->addSelection("dir:/data/storage/disk0"); + MSqlQuery query(MSqlQuery::InitCon()); + +@@ -573,18 +573,18 @@ + static HostCheckBox *HostncidClient() + { + HostCheckBox *gc = new HostCheckBox("HostncidClient"); +- gc->setLabel(QObject::tr("Show Callerid")); ++ gc->setLabel(QObject::tr("Show CallerID")); + gc->setValue(false); +- gc->setHelpText(QObject::tr("Callerid popup, backend must be running the callerid program")); ++ gc->setHelpText(QObject::tr("Show CallerID popup. The backend must be running the CallerID program.")); + return gc; + }; + + static HostCheckBox *HostncidDaemon() + { + HostCheckBox *gc = new HostCheckBox("HostncidDaemon"); +- gc->setLabel(QObject::tr("Run Callerid ")); ++ gc->setLabel(QObject::tr("Run CallerID")); + gc->setValue(false); +- gc->setHelpText(QObject::tr("Run Daemon to collect callerid info")); ++ gc->setHelpText(QObject::tr("Run daemon to collect CallerID information.")); + return gc; + }; + +@@ -614,9 +614,9 @@ + static HostCheckBox *Hostbootsplash() + { + HostCheckBox *gc = new HostCheckBox("Hostbootsplash"); +- gc->setLabel(QObject::tr("Enable bootsplash")); ++ gc->setLabel(QObject::tr("Enable Boot Splash")); + gc->setValue(false); +- gc->setHelpText(QObject::tr("Covers up boot messages. ")); ++ gc->setHelpText(QObject::tr("Covers up boot messages with LinHES logo.")); + return gc; + }; + +@@ -752,80 +752,80 @@ + static HostCheckBox *Hostaccessnetwork() + { + HostCheckBox *gc = new HostCheckBox("Hostaccessnetwork"); +- gc->setLabel(QObject::tr("Network ")); ++ gc->setLabel(QObject::tr("Network")); + gc->setValue(false); +- gc->setHelpText(QObject::tr("Control access to network screen. Checked means the screen is enabled.")); ++ gc->setHelpText(QObject::tr("Control access to Network Settings. Checked means the screen is enabled.")); + return gc; + }; + + static HostCheckBox *Hostaccesshostype() + { + HostCheckBox *gc = new HostCheckBox("Hostaccesshostype"); +- gc->setLabel(QObject::tr("hostype ")); ++ gc->setLabel(QObject::tr("Host")); + gc->setValue(true); +- gc->setHelpText(QObject::tr("Control access to hostype screen. Checked means the screen is enabled.")); ++ gc->setHelpText(QObject::tr("Control access to Host Settings. Checked means the screen is enabled.")); + return gc; + }; + + static HostCheckBox *HostaccesshostypeSystemtype() + { + HostCheckBox *gc = new HostCheckBox("HostaccesshostypeSystemtype"); +- gc->setLabel(QObject::tr("Change hostype")); ++ gc->setLabel(QObject::tr("Change System Type")); + gc->setValue(false); +- gc->setHelpText(QObject::tr("Ability to change sql server and system type. Checked means the screen is enabled.")); ++ gc->setHelpText(QObject::tr("Ability to change the System Type in Host Settings. Checked means the screen is enabled.")); + return gc; + }; + + static HostCheckBox *Hostaccessmisc() + { + HostCheckBox *gc = new HostCheckBox("Hostaccessmisc"); +- gc->setLabel(QObject::tr("misc ")); ++ gc->setLabel(QObject::tr("Miscellanous")); + gc->setValue(true); +- gc->setHelpText(QObject::tr("Control access to misc screen. Checked means the screen is enabled.")); ++ gc->setHelpText(QObject::tr("Control access to Miscellanous Settings. Checked means the screen is enabled.")); + return gc; + }; + + static HostCheckBox *Hostaccesssleep() + { + HostCheckBox *gc = new HostCheckBox("Hostaccesssleep"); +- gc->setLabel(QObject::tr("sleep ")); ++ gc->setLabel(QObject::tr("Shutdown")); + gc->setValue(true); +- gc->setHelpText(QObject::tr("Control access to sleep screen. Checked means the screen is enabled.")); ++ gc->setHelpText(QObject::tr("Control access to Shutdown Settings. Checked means the screen is enabled.")); + return gc; + }; + + static HostCheckBox *Hostaccessadvanced() + { + HostCheckBox *gc = new HostCheckBox("Hostaccessadvanced"); +- gc->setLabel(QObject::tr("advanced ")); ++ gc->setLabel(QObject::tr("Advanced")); + gc->setValue(true); +- gc->setHelpText(QObject::tr("Control access to advanced screen. Checked means the screen is enabled. ")); ++ gc->setHelpText(QObject::tr("Control access to Advanced Settings. Checked means the screen is enabled. ")); + return gc; + }; + + static HostCheckBox *HostaccessadvancedX() + { + HostCheckBox *gc = new HostCheckBox("HostaccessadvancedX"); +- gc->setLabel(QObject::tr("advancedX ")); ++ gc->setLabel(QObject::tr("Display")); + gc->setValue(true); +- gc->setHelpText(QObject::tr("Control access to advancedX screen. Checked means the screen is enabled. ")); ++ gc->setHelpText(QObject::tr("Control access to Display Settings. Checked means the screen is enabled. ")); + return gc; + }; + static HostCheckBox *Hostaccesssound() + { + HostCheckBox *gc = new HostCheckBox("Hostaccesssound"); +- gc->setLabel(QObject::tr("sound ")); ++ gc->setLabel(QObject::tr("Audio")); + gc->setValue(true); +- gc->setHelpText(QObject::tr("Control access to sound screen. Checked means the screen is enabled.")); ++ gc->setHelpText(QObject::tr("Control access to Audio Settings. Checked means the screen is enabled.")); + return gc; + }; + + static HostCheckBox *Hostaccessplugins() + { + HostCheckBox *gc = new HostCheckBox("Hostaccessplugins"); +- gc->setLabel(QObject::tr("plugins")); ++ gc->setLabel(QObject::tr("Programs")); + gc->setValue(true); +- gc->setHelpText(QObject::tr("Control access to plugin screen. Checked means the screen is enabled.")); ++ gc->setHelpText(QObject::tr("Control access to Programs. Checked means the screen is enabled.")); + return gc; + }; + +@@ -834,25 +834,25 @@ + HostCheckBox *gc = new HostCheckBox("Hostaccessuser"); + gc->setLabel(QObject::tr("User")); + gc->setValue(false); +- gc->setHelpText(QObject::tr("Control access to the user managment screen. Checked means the screen is enabled.")); ++ gc->setHelpText(QObject::tr("Control access to User Management Settings. Checked means the screen is enabled.")); + return gc; + }; + + static HostCheckBox *Hostaccesswebuser() + { + HostCheckBox *gc = new HostCheckBox("Hostaccesswebuser"); +- gc->setLabel(QObject::tr("Web password")); ++ gc->setLabel(QObject::tr("Web Security")); + gc->setValue(true); +- gc->setHelpText(QObject::tr("Control access to the web password screen. Checked means the screen is enabled.")); ++ gc->setHelpText(QObject::tr("Control access to Web Security Settings. Checked means the screen is enabled.")); + return gc; + }; + + static HostCheckBox *Hostaccessvnc() + { + HostCheckBox *gc = new HostCheckBox("Hostaccessvnc"); +- gc->setLabel(QObject::tr("VNC ")); ++ gc->setLabel(QObject::tr("VNC")); + gc->setValue(true); +- gc->setHelpText(QObject::tr("Control access to the vnc password screen. Checked means the screen is enabled.")); ++ gc->setHelpText(QObject::tr("Control access to VNC Settings. Checked means the screen is enabled.")); + return gc; + }; + +@@ -860,9 +860,9 @@ + static HostCheckBox *Hostaccessfileshare() + { + HostCheckBox *gc = new HostCheckBox("Hostaccessfileshare"); +- gc->setLabel(QObject::tr("fileshare ")); ++ gc->setLabel(QObject::tr("File Sharing")); + gc->setValue(true); +- gc->setHelpText(QObject::tr("Control access to the fileshare. Checked means the screen is enabled.")); ++ gc->setHelpText(QObject::tr("Control access to File Sharing Settings. Checked means the screen is enabled.")); + return gc; + }; + +@@ -2202,7 +2202,7 @@ + public: + NetworkSettingsFrame(): + TriggeredConfigurationGroup(false, false, true, true,false, false, true, true) { +- setLabel(QObject::tr("Network Settings Page (1/2)")); ++ setLabel(QObject::tr("Network Settings (1/2)")); + Setting* netdevice = HostNetDevice(); + addChild(netdevice); + setTrigger(netdevice); +@@ -2349,6 +2349,7 @@ + NetworkOptionsFrame::NetworkOptionsFrame(): + VerticalConfigurationGroup(false,false,false,false) + { ++ setLabel(QObject::tr("Network Settings (2/2)")); + HostMyhostname = new HostComboBox("HostMyhostname",true); + HostMyhostname->setLabel(QObject::tr("Hostname")); + HostMyhostname->addSelection("Envy"); +@@ -2366,9 +2367,7 @@ + HostMyhostname->addSelection("Faith"); + HostMyhostname->addSelection("Zeal"); + HostMyhostname->addSelection("type_hostname_here"); +- HostMyhostname->setHelpText(QObject::tr("The hostname must resolve via DNS. \ +- If DNS is not available then append .local to the end of the hostname. \ +- When using .local, names must not include additional .")); ++ HostMyhostname->setHelpText(QObject::tr("The hostname must resolve via DNS. If DNS is not available then append .local to the end of the hostname. When using .local, names must not include an additional .")); + + FetchDhcpHostnameButton = new TransButtonSetting(); + FetchDhcpHostnameButton ->setLabel(tr("Ask DHCP server for hostname")); +@@ -2494,9 +2493,9 @@ + static HostCheckBox *HostUseXLargeMouse() + { + HostCheckBox *gc = new HostCheckBox("HostUseXLargeMouse"); +- gc->setLabel(QObject::tr("Large mouse pointer")); ++ gc->setLabel(QObject::tr("Large Mouse Pointer")); + gc->setValue(true); +- gc->setHelpText(QObject::tr("Use extra large mouse pointer(requires restart of frontend)")); ++ gc->setHelpText(QObject::tr("Use an extra large mouse pointer. This takes effect the next time the frontend is started.")); + return gc; + }; + +@@ -2549,7 +2548,7 @@ + SystemtypeGroup::SystemtypeGroup(): TriggeredConfigurationGroup(true,true,true,true,true,true,true,true) { + setLabel(QObject::tr("System Type")); + HostSystemType = new HostComboBox("HostSystemType"); +- HostSystemType->setLabel(QObject::tr("Type of system setup")); ++ HostSystemType->setLabel(QObject::tr(" System Type")); + HostSystemType->addSelection("Master_backend"); + HostSystemType->addSelection("Frontend_only"); + // HostSystemType->addSelection("Standalone"); +@@ -2608,13 +2607,13 @@ + } + + if (selectedhostype == "Standalone") +- msg="Complete System, that doesn't allow outside connections"; ++ msg="Complete System, that doesn't allow outside connections."; + if (selectedhostype == "Frontend_only") +- msg="Frontend only, needs a primary system (master backend) already on the network"; ++ msg="Frontend_only needs a primary system (master backend) already on the network."; + if (selectedhostype == "Master_backend") +- msg="Primary system with tuners, scheduling and database. This allows for remote frontend and slave backends"; ++ msg="Primary system with tuners, scheduling and database. This allows for remote frontend and slave backends."; + if (selectedhostype == "Slave_backend") +- msg="Secondary system for extra tuners"; ++ msg="Secondary system for extra tuners."; + + HostSystemType->setHelpText(msg) ; + } +@@ -2670,7 +2669,7 @@ + TriggeredConfigurationGroup(true,true,true,true,true,true,true,true) + { + +- setLabel(QObject::tr("Advanced settings (1/2)")); ++ setLabel(QObject::tr("Advanced Settings (1/2)")); + Setting* Autodown = HostAutodown(); + setTrigger(Autodown); + hostparm.ThisSystemType = gCoreContext->GetSetting("HostSystemType"); +@@ -2723,7 +2722,7 @@ + public: + AdvancedSettings_2(): + TriggeredConfigurationGroup(true,true,true,true,true,true,true,true) { +- setLabel(QObject::tr("Advanced settings (2/2)")); ++ setLabel(QObject::tr("Advanced Settings (2/2)")); + Setting* Autodown = HostAutodown(); + setTrigger(Autodown); + hostparm.ThisSystemType = gCoreContext->GetSetting("HostSystemType"); +@@ -2767,15 +2766,15 @@ + /*_______________________________Sound settings ____________________*/ + SoundSettings::SoundSettings(): + TriggeredConfigurationGroup(true,true,true,true,true,true,true,true) { +- setLabel(QObject::tr("Audio out settings")); ++ setLabel(QObject::tr("Audio Settings")); + + HostAudiotype = new HostComboBox("HostAudiotype",false); +- HostAudiotype->setLabel(QObject::tr("Sound card driver")); ++ HostAudiotype->setLabel(QObject::tr("Sound Card Driver")); + HostAudiotype->addSelection("OSS"); + HostAudiotype->addSelection("ALSA"); + HostAudiotype->addSelection("tinker"); + +- HostAudiotype->setHelpText(QObject::tr("Select the sound driver set to use (OSS or ALSA)." ) ); ++ HostAudiotype->setHelpText(QObject::tr("Select the sound driver, OSS or ALSA." ) ); + addChild(HostAudiotype); + setTrigger(HostAudiotype); + +@@ -2826,10 +2825,10 @@ + osslabel->setValue("The original OSS! More information can be found at:"); + + TransLabelSetting *osslabel1 = new TransLabelSetting(); +- osslabel1->setValue("http://www.opensound.com \n\nPlease note to fully configure sound visit the \nmythtv audio setup screens\n"); ++ osslabel1->setValue("http://www.opensound.com \n\nPlease note to fully configure sound visit the \nMythTV audio setup.\n"); + + TransLabelSetting *AlsaLabel = new TransLabelSetting(); +- AlsaLabel->setValue("ALSA, the alternative to OSS\n\nPlease note to fully configure sound visit the \nmythtv audio setup screens\n"); ++ AlsaLabel->setValue("ALSA, the alternative to OSS\n\nPlease note to fully configure sound visit the \nMythTV audio setup.\n"); + + // OSS GROUP + SoundOSSsettings *OSS = new SoundOSSsettings ; +@@ -4477,7 +4476,7 @@ + //Check to see if screen is allowed to appear + if ( ((gCoreContext->GetSetting("Hostaccessnetwork")) == "0" ) ) + { +- denied ->setLabel(QObject::tr("Network settings")); ++ denied ->setLabel(QObject::tr("Network Settings")); + addChild(denied); + } + else +@@ -4528,7 +4527,7 @@ + { + if ( ((gCoreContext->GetSetting("Hostaccesshostype")) =="0" )) + { +- denied ->setLabel(QObject::tr("System type")); ++ denied ->setLabel(QObject::tr("Host Settings")); + addChild(denied); + } + else +@@ -4548,7 +4547,7 @@ + { + if ( ((gCoreContext->GetSetting("HostaccessadvancedX")) == "0" )) + { +- denied ->setLabel(QObject::tr("AdvancedX Settings")); ++ denied ->setLabel(QObject::tr("Display Settings")); + addChild(denied); + } + else +@@ -4562,7 +4561,7 @@ + { + if ( ((gCoreContext->GetSetting("Hostaccessvnc")) == "0" )) + { +- denied ->setLabel(QObject::tr("VNC settings")); ++ denied ->setLabel(QObject::tr("VNC Settings")); + addChild(denied); + } + else +@@ -4576,7 +4575,7 @@ + { + if ( ((gCoreContext->GetSetting("Hostaccessfileshare")) == "0" )) + { +- denied ->setLabel(QObject::tr("File Share settings")); ++ denied ->setLabel(QObject::tr("File Sharing Settings")); + addChild(denied); + } + else +@@ -4595,7 +4594,7 @@ + { + if ( ((gCoreContext->GetSetting("Hostaccessmisc")) == "0" )) + { +- denied ->setLabel(QObject::tr("Misc")); ++ denied ->setLabel(QObject::tr("Miscellanous")); + addChild(denied); + } + else +@@ -4618,7 +4617,7 @@ + { + if ( ((gCoreContext->GetSetting("Hostaccesssleep")) == "0" )) + { +- denied ->setLabel(QObject::tr("WOL settings")); ++ denied ->setLabel(QObject::tr("Shutdown Settings")); + addChild(denied); + } + else +@@ -4647,7 +4646,7 @@ + { + if ( ((gCoreContext->GetSetting("Hostaccesssound")) =="0") ) + { +- denied ->setLabel(QObject::tr("Sound Settings")); ++ denied ->setLabel(QObject::tr("Audio Settings")); + addChild(denied); + } + else +@@ -4705,7 +4704,7 @@ + accessettings->addChild(Hostaccessnetwork()); + accessettings->addChild(new ACCESShostsettings); + accessettings->addChild(GridAccess); +- accessettings ->setLabel(QObject::tr("Access control")); ++ accessettings ->setLabel(QObject::tr("Access Control Settings")); + addChild(accessettings); + } + +@@ -4713,7 +4712,7 @@ + { + if ( ((gCoreContext->GetSetting("Hostaccessplugins")) == "0" )) + { +- denied ->setLabel(QObject::tr("Plugins")); ++ denied ->setLabel(QObject::tr("Programs")); + addChild(denied); + } + else +@@ -4754,7 +4753,7 @@ + { + if ( ((gCoreContext->GetSetting("Hostaccessplugins")) == "0" )) + { +- denied ->setLabel(QObject::tr("Software")); ++ denied ->setLabel(QObject::tr("Programs")); + addChild(denied); + } + else +@@ -4788,7 +4787,7 @@ + { + if ( ((gCoreContext->GetSetting("Hostaccessuser")) == "0" )) + { +- denied ->setLabel(QObject::tr("User Management")); ++ denied ->setLabel(QObject::tr("User Management Settings")); + addChild(denied); + } + else +@@ -4802,7 +4801,7 @@ + { + if ( ((gCoreContext->GetSetting("Hostaccesswebuser")) == "0" )) + { +- denied ->setLabel(QObject::tr("Web security")); ++ denied ->setLabel(QObject::tr("Web Security Settings")); + addChild(denied); + } + else +@@ -4817,7 +4816,7 @@ + { + if ( ((gCoreContext->GetSetting("Hostaccessddns")) == "0" )) + { +- denied ->setLabel(QObject::tr("DDNS security")); ++ denied ->setLabel(QObject::tr("DDNS Settings")); + addChild(denied); + } + else |