Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

Merge pull request #2027 from BOINC/daemon 

Manager: use "client" instead of "daemon"
This commit is contained in:
David Anderson 2017-08-14 12:40:53 -07:00 committed by GitHub
parent ac21dc8e1f d73d5120eb
commit a5bf5b4958
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clientgui/BOINCBaseFrame.cpp
View File

@ -642,7 +642,7 @@ void CBOINCBaseFrame::ShowDaemonStartFailedAlert() {
);
#else
strDialogMessage.Printf(
_("%s is not able to start a %s client.\nPlease start the daemon and try again."),
_("%s is not able to start a %s client.\nPlease run the client and try again."),
pSkinAdvanced->GetApplicationName().c_str(),
pSkinAdvanced->GetApplicationShortName().c_str()
);

2
clientgui/BOINCGUIApp.cpp
View File

@ -599,7 +599,7 @@ void CBOINCGUIApp::OnInitCmdLine(wxCmdLineParser &parser) {
#if (defined(__WXMAC__) && defined(_DEBUG))
parser.AddLongOption("NSDocumentRevisionsDebugMode", _("Not used: workaround for bug in XCode 4.2"));
#endif
parser.AddSwitch("nd", "no-daemon", _("Not run the daemon"));
parser.AddSwitch("nd", "no-daemon", _("Don't run the client"));
}

4
clientgui/DlgOptions.cpp
View File

@ -210,13 +210,13 @@ void CDlgOptions::CreateControls() {
#endif
wxStaticText* itemStaticText11 = new wxStaticText;
itemStaticText11->Create( itemPanel4, wxID_STATIC, _("Run daemon?"), wxDefaultPosition, wxDefaultSize, 0 );
itemStaticText11->Create( itemPanel4, wxID_STATIC, _("Run the client?"), wxDefaultPosition, wxDefaultSize, 0 );
itemFlexGridSizer6->Add(itemStaticText11, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5);
m_EnableRunDaemonCtrl = new wxCheckBox;
m_EnableRunDaemonCtrl->Create( itemPanel4, ID_ENABLERUNDAEMON, wxT(""), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE);
if (ShowToolTips())
m_EnableRunDaemonCtrl->SetToolTip(_("Run daemon when launching the Manager."));
m_EnableRunDaemonCtrl->SetToolTip(_("Run the client when launching the Manager."));
itemFlexGridSizer6->Add(m_EnableRunDaemonCtrl, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5);
wxStaticText* itemStaticText12 = new wxStaticText;

26
doc/versions.inc
View File

@ -44,12 +44,12 @@ function linux_info() {
}
$w78 = array(
"num"=>"7.8.0",
"num"=>"7.8.1",
"status"=>"Development version",
"file"=>"boinc_7.8.0_windows_intelx86.exe",
"vbox_file"=>"boinc_7.8.0_windows_intelx86_vbox.exe",
"vbox_version"=>"5.1.22",
"date"=>"1 July 2017",
"file"=>"boinc_7.8.1_windows_intelx86.exe",
"vbox_file"=>"boinc_7.8.1_windows_intelx86_vbox.exe",
"vbox_version"=>"5.1.26",
"date"=>"12 Aug 2017",
"type"=>"win_new",
);
@ -100,12 +100,12 @@ $w5816 = array(
);
$w78x64 = array(
"num"=>"7.8.0",
"num"=>"7.8.1",
"status"=>"Development version",
"file"=>"boinc_7.8.0_windows_x86_64.exe",
"vbox_file"=>"boinc_7.8.0_windows_x86_64_vbox.exe",
"vbox_version"=>"5.1.22",
"date"=>"1 July 2017",
"file"=>"boinc_7.8.1_windows_x86_64.exe",
"vbox_file"=>"boinc_7.8.1_windows_x86_64_vbox.exe",
"vbox_version"=>"5.1.26",
"date"=>"12 Aug 2017",
"type"=>"win_new",
);
@ -150,10 +150,10 @@ $w72x64 = array(
);
$m78 = array(
"num"=>"7.8.0",
"num"=>"7.8.1",
"status"=>"Development version",
"file"=>"boinc_7.8.0_macOSX_x86_64.zip",
"date"=>"1 July 2017",
"file"=>"boinc_7.8.1_macOSX_x86_64.zip",
"date"=>"12 Aug 2017",
"type"=>"mac_advanced",
);