From c631ab3f1d63a65e8132a7f9073edb81a9b58408 Mon Sep 17 00:00:00 2001 From: Charlie Fenton Date: Wed, 8 Jun 2011 10:41:34 +0000 Subject: [PATCH] MGR: Use same exit confirmation dialog wording for Linux as for Windows svn path=/trunk/boinc/; revision=23678 --- checkin_notes | 2 ++ clientgui/DlgExitMessage.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/checkin_notes b/checkin_notes index 79edd94eda..3d4dedf6ac 100644 --- a/checkin_notes +++ b/checkin_notes @@ -3423,7 +3423,9 @@ Charlie 7 Jun 2011 skip exit confirmation dialog but do shut down local client if requested in most recently run exit dialog, whether or not "Remember this decision" was set. + - MGR: Use same exit confirmation dialog wording for Linux as for Windows. clientgui/ BOINCGUIApp.cpp, .h MainDocument.cpp, .h + DlgExitMessage.cpp diff --git a/clientgui/DlgExitMessage.cpp b/clientgui/DlgExitMessage.cpp index c0c4eb1042..3a3b5e0ca2 100644 --- a/clientgui/DlgExitMessage.cpp +++ b/clientgui/DlgExitMessage.cpp @@ -125,7 +125,7 @@ void CDlgExitMessage::CreateControls() wxFlexGridSizer* itemFlexGridSizer4 = new wxFlexGridSizer(3, 1, 0, 0); itemBoxSizer3->Add(itemFlexGridSizer4, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); -#ifdef __WXMSW__ +#ifndef __WXMAC__ strExitMessage.Printf( _("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()