From 660b2ae762d3801e77046d09858c3ac7be5fdb84 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Wed, 25 May 2011 23:13:26 +0000 Subject: [PATCH] - Manager: tweak messages in exit dialog svn path=/trunk/boinc/; revision=23613 --- checkin_notes | 6 ++++++ clientgui/DlgExitMessage.cpp | 7 ++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/checkin_notes b/checkin_notes index ba06df6b61..953f84473a 100644 --- a/checkin_notes +++ b/checkin_notes @@ -3184,3 +3184,9 @@ David 25 May 2011 client/ cs_notices.cpp + +David 25 May 2011 + - Manager: tweak messages in exit dialog + + clientgui/ + DlgExitMessage.cpp diff --git a/clientgui/DlgExitMessage.cpp b/clientgui/DlgExitMessage.cpp index 714fa9888b..344f76c02e 100644 --- a/clientgui/DlgExitMessage.cpp +++ b/clientgui/DlgExitMessage.cpp @@ -127,12 +127,12 @@ void CDlgExitMessage::CreateControls() #ifdef __WXMSW__ strExitMessage.Printf( - _("You have requested to exit the %s,\nwhich allows you to view and manage\nthe science applications running on your computer.\n\nIf you also want to stop running the science applications when you\nexit the Manager, then choose from the following options:"), + _("You have requested to exit the %s,\nwhich allows you to view and manage\nthe tasks running on your computer.\n\nIf you also want to stop running the tasks,\nchoose from the following options:"), pSkinAdvanced->GetApplicationName().c_str() ); #else strExitMessage.Printf( - _("This will shut down %s and its tasks entirely until either the\n%s application or the %s screen saver is run again.\n\nIn most cases, it is better just to close the %s window\nrather than to exit the application; that will allow %s to run its\ntasks at the times you selected in your preferences."), + _("This will shut down %s and its tasks until either the\n%s or the %s screen saver is run again.\n\nIn most cases, it is better just to close the %s window\nrather than to exit the application; that will allow %s to run its\ntasks at the times you selected in your preferences."), pSkinAdvanced->GetApplicationShortName().c_str(), pSkinAdvanced->GetApplicationName().c_str(), pSkinAdvanced->GetApplicationShortName().c_str(), @@ -150,7 +150,8 @@ void CDlgExitMessage::CreateControls() #ifndef __WXMAC__ strAlwaysExitMessage.Printf( - _("Stop running science applications when exiting the Manager") + _("Stop running tasks when exiting the %s") + pSkinAdvanced->GetApplicationName().c_str(), ); m_DialogShutdownCoreClient = new wxCheckBox;