From d73d5120eb79ed8a36365876d31e5bcf26a61c63 Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Sat, 12 Aug 2017 15:03:42 -0700
Subject: [PATCH] Manager: use "client" instead of "daemon"

---
 clientgui/BOINCBaseFrame.cpp |  2 +-
 clientgui/BOINCGUIApp.cpp    |  2 +-
 clientgui/DlgOptions.cpp     |  4 ++--
 doc/versions.inc             | 26 +++++++++++++-------------
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/clientgui/BOINCBaseFrame.cpp b/clientgui/BOINCBaseFrame.cpp
index 14d5bc7881..1bb5054c7b 100644
--- a/clientgui/BOINCBaseFrame.cpp
+++ b/clientgui/BOINCBaseFrame.cpp
@@ -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()
     );
diff --git a/clientgui/BOINCGUIApp.cpp b/clientgui/BOINCGUIApp.cpp
index 900424a659..0126b55164 100644
--- a/clientgui/BOINCGUIApp.cpp
+++ b/clientgui/BOINCGUIApp.cpp
@@ -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"));
 }
 
 
diff --git a/clientgui/DlgOptions.cpp b/clientgui/DlgOptions.cpp
index 87b034d2e9..e09e326c85 100644
--- a/clientgui/DlgOptions.cpp
+++ b/clientgui/DlgOptions.cpp
@@ -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;
diff --git a/doc/versions.inc b/doc/versions.inc
index 753c486744..6b6a2aa23c 100644
--- a/doc/versions.inc
+++ b/doc/versions.inc
@@ -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",
 );