summaryrefslogtreecommitdiffstats
path: root/abs/core/mythinstall/fileshare.cpp.patch
diff options
context:
space:
mode:
Diffstat (limited to 'abs/core/mythinstall/fileshare.cpp.patch')
-rw-r--r--abs/core/mythinstall/fileshare.cpp.patch156
1 files changed, 0 insertions, 156 deletions
diff --git a/abs/core/mythinstall/fileshare.cpp.patch b/abs/core/mythinstall/fileshare.cpp.patch
deleted file mode 100644
index d220705..0000000
--- a/abs/core/mythinstall/fileshare.cpp.patch
+++ /dev/null
@@ -1,156 +0,0 @@
---- fileshare.cpp.orig 2013-12-07 16:36:24.882995387 +0000
-+++ fileshare.cpp 2013-12-07 17:52:59.075231547 +0000
-@@ -24,10 +24,10 @@
- static HostComboBox *HostHaveCentralNFS()
- {
- HostComboBox *gc = new HostComboBox("HostHaveCentralNFS");
-- gc->setLabel(QObject::tr("Central NFS server"));
-+ gc->setLabel(QObject::tr("Central NFS Server"));
- gc->addSelection("no");
- gc->addSelection("yes") ;
-- gc->setHelpText(QObject::tr("Select yes, if your media is stored on an NFS server different than the masterbackend. Say no if you are confused."));
-+ gc->setHelpText(QObject::tr("Select yes, if your media is stored on an NFS server different than the master backend. Select no if you are unsure."));
-
- return gc;
- }
-@@ -35,8 +35,8 @@
- static HostComboBox *HostCentralNFSIP()
- {
- HostComboBox *gc = new HostComboBox("HostCentralNFSIP",true);
-- gc->setLabel(QObject::tr("NFS server"));
-- gc->setHelpText(QObject::tr("Format should be IP:/SHARENAME, for example 192.168.1.6:/media. file:nfsmap will load shares from the nfsmap file"));
-+ gc->setLabel(QObject::tr("NFS Server"));
-+ gc->setHelpText(QObject::tr("Format should be IP:/SHARENAME, For example 192.168.1.6:/media. file:nfsmap will load shares from the nfsmap file."));
- gc->addSelection("example ip:share") ;
- gc->addSelection("file:nfsmap_auto") ;
- gc->addSelection("file:nfsmap") ;
-@@ -57,7 +57,7 @@
-
- HostComboBox *gc = new HostComboBox("HostNFSmountpoint",true);
- gc->addSelection("/data/storage/central_nfs");
-- gc->setLabel(QObject::tr("Mount point"));
-+ gc->setLabel(QObject::tr("Mount Point"));
- gc->setHelpText(QObject::tr(""));
- return gc;
- }
-@@ -65,9 +65,9 @@
- static HostCheckBox *HostCentralNFSallhosts()
- {
- HostCheckBox *gc = new HostCheckBox("HostCentralNFSallhosts");
-- gc->setLabel(QObject::tr("All hosts use this share"));
-+ gc->setLabel(QObject::tr("All Hosts Use This Share"));
- gc->setValue(true);
-- gc->setHelpText(QObject::tr("If checked then all new hosts added to the cluster will try to access the same share"));
-+ gc->setHelpText(QObject::tr("If checked then all new hosts added to the cluster will try to access the same share."));
- return gc;
- };
-
-@@ -111,6 +111,7 @@
- FileShareMainFrameClient::FileShareMainFrameClient():
- VerticalConfigurationGroup(false,false,false,false)
- {
-+ setLabel(QObject::tr("File Sharing Settings (1/2)"));
- VerticalConfigurationGroup* fileshareframeclientsettings =
- new VerticalConfigurationGroup(false, true,false,false);
-
-@@ -125,26 +126,26 @@
- static HostCheckBox *HostServiceNFS()
- {
- HostCheckBox *gc = new HostCheckBox("HostServiceNFS");
-- gc->setLabel(QObject::tr("Standard file sharing using NFS"));
-+ gc->setLabel(QObject::tr("File Sharing using NFS"));
- gc->setValue(true);
-- gc->setHelpText(QObject::tr("Allow any machine on your network access to media via NFS"));
-+ gc->setHelpText(QObject::tr("If checked, any device on the network can access media via NFS."));
- return gc;
- };
- static HostCheckBox *HostServiceSamba()
- {
- HostCheckBox *gc = new HostCheckBox("HostServiceSamba");
-- gc->setLabel(QObject::tr("Windows sharing"));
-+ gc->setLabel(QObject::tr("File Sharing using SMB (Windows Sharing)"));
- gc->setValue(false);
-- gc->setHelpText(QObject::tr("Allow window machines to access media via windows file sharing"));
-+ gc->setHelpText(QObject::tr("If checked, any device on the network can access media via Windows SMB file sharing."));
- return gc;
- };
-
- static HostCheckBox *HostServiceSamba_write()
- {
- HostCheckBox *gc = new HostCheckBox("HostServiceSamba_write");
-- gc->setLabel(QObject::tr("Readonly"));
-+ gc->setLabel(QObject::tr("ReadOnly"));
- gc->setValue(false);
-- gc->setHelpText(QObject::tr("If checked, all remote connections will be read only. If not checked then remote clients will have write and delete abilites. "));
-+ gc->setHelpText(QObject::tr("If checked, all remote connections will be read only. If not checked, remote clients will have write and delete abilities."));
- return gc;
- };
-
-@@ -152,16 +153,16 @@
- static HostCheckBox *HostServiceSamba_writehome()
- {
- HostCheckBox *gc = new HostCheckBox("HostServiceSamba_writehome");
-- gc->setLabel(QObject::tr("Readonly"));
-+ gc->setLabel(QObject::tr("ReadOnly"));
- gc->setValue(false);
-- gc->setHelpText(QObject::tr("If checked, all remote connections will be read only. If not checked then remote clients will have write and delete abilites. "));
-+ gc->setHelpText(QObject::tr("If checked, all remote connections will be read only. If not checked, remote clients will have write and delete abilities."));
- return gc;
- };
-
- static HostCheckBox *HostServiceSamba_media()
- {
- HostCheckBox *gc = new HostCheckBox("HostServiceSamba_media");
-- gc->setLabel(QObject::tr("share media"));
-+ gc->setLabel(QObject::tr("Share media"));
- gc->setValue(true);
- gc->setHelpText(QObject::tr(" "));
- return gc;
-@@ -170,7 +171,7 @@
- static HostCheckBox *HostServiceSamba_home()
- {
- HostCheckBox *gc = new HostCheckBox("HostServiceSamba_home");
-- gc->setLabel(QObject::tr("share home"));
-+ gc->setLabel(QObject::tr("Share home"));
- gc->setValue(true);
- gc->setHelpText(QObject::tr(" "));
- return gc;
-@@ -182,7 +183,7 @@
- {
- HostComboBox *gc = new HostComboBox("HostServiceSamba_domain",true);
- gc->setLabel(QObject::tr("Workgroup"));
-- gc->setHelpText(QObject::tr("Workgroup for smb share"));
-+ gc->setHelpText(QObject::tr("Workgroup for Windows SMB shares."));
- gc->addSelection("WORKGROUP");
- QString currentitem;
- QString line;
-@@ -231,7 +232,7 @@
-
- void smb_busy_box() {
- system ("nmbscan -d > /tmp/smbdomainlist & ");
-- QString msgtext="Searching for windows workgroups";
-+ QString msgtext="Searching for Windows Workgroups";
- int return_code;
- MythScreenStack *popupStack = GetMythMainWindow()->GetStack("popup stack");
- MythUIBusyDialog *busyPopup = new MythUIBusyDialog(msgtext, popupStack,
-@@ -286,15 +287,17 @@
-
- //_______________Server NFS Frame
- FileShareMainFrameServer::FileShareMainFrameServer():
--VerticalConfigurationGroup(true,false,false,false)
-+VerticalConfigurationGroup(false,false,false,false)
- {
-+ setLabel(QObject::tr("File Sharing Settings (2/2)"));
-+
- VerticalConfigurationGroup* denied = new VerticalConfigurationGroup(false,false,true,true);
- TransLabelSetting *deniedlabel = new TransLabelSetting();
-- deniedlabel->setValue(" File sharing is not available for Front end only systems " );
-+ deniedlabel->setValue(" File sharing is not available for frontend_only systems." );
- denied->addChild(deniedlabel);
-
- VerticalConfigurationGroup* fileshare_frame_serversettings =
-- new VerticalConfigurationGroup(false, true,false,false);
-+ new VerticalConfigurationGroup(false,false,false,false);
- fileshare_frame_serversettings->addChild(HostServiceNFS());
- fileshare_frame_serversettings->addChild(new SAMBAsettings);
-