diff --git a/checkin_notes b/checkin_notes index 5fb96f8658..ae1027aaa7 100644 --- a/checkin_notes +++ b/checkin_notes @@ -8877,3 +8877,9 @@ Charlie 31 Oct 2009 mac_build/ Mac_SA_Secure.sh +David 31 Oct 2009 + - MGR: fixed some strings, removed trailing \n's + + clientgui + AdvancedFrame.cpp + ProjectProcessingPage.cpp diff --git a/clientgui/AdvancedFrame.cpp b/clientgui/AdvancedFrame.cpp index 17931720a2..b7521b7a7b 100644 --- a/clientgui/AdvancedFrame.cpp +++ b/clientgui/AdvancedFrame.cpp @@ -1416,7 +1416,7 @@ void CAdvancedFrame::OnClientShutdown(wxCommandEvent& WXUNUSED(event)) { // %s is the application name // i.e. 'BOINC Manager', 'GridRepublic Manager' strDialogTitle.Printf( - _("%s - Shutdown the current client..."), + _("%s - Shut down the current client..."), pSkinAdvanced->GetApplicationName().c_str() ); @@ -1425,7 +1425,7 @@ void CAdvancedFrame::OnClientShutdown(wxCommandEvent& WXUNUSED(event)) { // 2nd %s is the project name // i.e. 'BOINC', 'GridRepublic' strDialogMessage.Printf( - _("%s will shut down the currently connected client,\nand prompt you for another host to connect to.\n"), + _("%s will shut down the current client\nand prompt you for another host to connect to."), pSkinAdvanced->GetApplicationName().c_str() ); @@ -1472,7 +1472,7 @@ void CAdvancedFrame::OnRetryCommunications( wxCommandEvent& WXUNUSED(event) ) { wxASSERT(pDoc); wxASSERT(wxDynamicCast(pDoc, CMainDocument)); - UpdateStatusText(_("Retrying communications for project(s)...")); + UpdateStatusText(_("Retrying communications.")); pDoc->rpc.network_available(); UpdateStatusText(wxT("")); diff --git a/clientgui/ProjectProcessingPage.cpp b/clientgui/ProjectProcessingPage.cpp index 6d859d973e..90ec61d4eb 100644 --- a/clientgui/ProjectProcessingPage.cpp +++ b/clientgui/ProjectProcessingPage.cpp @@ -320,7 +320,7 @@ void CProjectProcessingPage::OnPageChanged( wxWizardExEvent& event ) { wxASSERT(m_pProgressIndicator); m_pTitleStaticCtrl->SetLabel( - _("Communicating with project\nPlease wait...") + _("Communicating with project.") ); SetProjectCommunitcationsSucceeded(false); @@ -496,10 +496,10 @@ void CProjectProcessingPage::OnStateChange( CProjectProcessingPageEvent& WXUNUSE strBuffer = pWAP->m_CompletionErrorPage->m_pServerMessagesCtrl->GetLabel(); if ((HTTP_STATUS_NOT_FOUND == ao->error_num)) { strBuffer += - _("Required wizard file(s) are missing from the target server.\n(lookup_account.php/create_account.php)\n"); + _("Required files not found on the server."); } else if ((HTTP_STATUS_INTERNAL_SERVER_ERROR == ao->error_num)) { strBuffer += - _("An internal server error has occurred.\n"); + _("An internal server error has occurred."); } else { if (ao->error_msg.size()) { strBuffer += wxString(ao->error_msg.c_str(), wxConvUTF8) + wxString(wxT("\n")); @@ -561,7 +561,7 @@ void CProjectProcessingPage::OnStateChange( CProjectProcessingPageEvent& WXUNUSE strBuffer = pWAP->m_CompletionErrorPage->m_pServerMessagesCtrl->GetLabel(); if ((HTTP_STATUS_INTERNAL_SERVER_ERROR == reply.error_num)) { strBuffer += - _("An internal server error has occurred.\n"); + _("An internal server error has occurred."); } else { for (i=0; iFifth BOINC Workshop was held Oct. 22-23 in Barcelona. + There were 35 attendees and 21 excellent talks; + many of the presentation slides and discussion notes are online." +), +array("October 30, 2009", + "Version 6.10 of the BOINC client software has been released for general use. Download it here." +), array("October 28, 2009", - "The Windows builds of 6.6.41 has been pulled from the Download - page due to a application version mismatch with some Microsoft components. Please use the 6.6.38 version until - 6.10 is released." + "The Windows versions of 6.6.41 have been recalled + due to a version mismatch with recent Microsoft updates. + Please use the 6.6.38 version until 6.10 is released." ), array("October 21, 2009", "An article in the Wall Street Journal