- MGR: fixed some strings, removed trailing \n's

svn path=/trunk/boinc/; revision=19440
This commit is contained in:
David Anderson 2009-11-01 00:34:12 +00:00
parent 474c33e094
commit 0fdd1ef4c8
4 changed files with 24 additions and 10 deletions

View File

@ -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

View File

@ -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(""));

View File

@ -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; i<reply.messages.size(); i++) {
strBuffer += wxString(reply.messages[i].c_str(), wxConvUTF8) + wxString(wxT("\n"));

View File

@ -1,10 +1,18 @@
<?
$project_news = array(
array("October 30, 2009",
"The <a href=http://boinc.berkeley.edu/trac/wiki/WorkShop09>Fifth BOINC Workshop</a> 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 <a href=http://boinc.berkeley.edu/download.php>here</a>."
),
array("October 28, 2009",
"The Windows builds of 6.6.41 has been pulled from the <a href=http://boinc.berkeley.edu/download.php>Download</a>
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 <a href=http://online.wsj.com/article/SB10001424052748703816204574483481567116994.html>article in the Wall Street Journal</a>