*** empty log message ***

svn path=/trunk/boinc/; revision=1945

client/client_state.C

@@ -552,10 +552,16 @@ enum SUSPEND_REASON_t {
 void CLIENT_STATE::check_suspend_activities(int& reason) {
     reason = 0;
 
+    // Don't work while we're running CPU benchmarks
+    //
+    if (check_cpu_benchmarks() == CPU_BENCHMARKS_RUNNING) {
+        reason |= SUSPEND_REASON_BENCHMARKS;
+    }
+
     if (user_run_request == USER_RUN_REQUEST_ALWAYS) return;
 
     if (user_run_request == USER_RUN_REQUEST_NEVER) {
-        reason = SUSPEND_REASON_USER_REQ;
+        reason |= SUSPEND_REASON_USER_REQ;
         return;
     }
 
@@ -573,12 +579,6 @@ void CLIENT_STATE::check_suspend_activities(int& reason) {
         reason |= SUSPEND_REASON_TIME_OF_DAY;
     }
 
-    // Don't work while we're running CPU benchmarks
-    //
-    if (check_cpu_benchmarks() == CPU_BENCHMARKS_RUNNING) {
-        reason |= SUSPEND_REASON_BENCHMARKS;
-    }
-
     return;
 }
 

client/win/resource.rc

@@ -196,7 +196,7 @@ BEGIN
     BEGIN
         MENUITEM "Force &run",                  ID_FILE_RUN_REQUEST_ALWAYS
         MENUITEM "Run based on &preferences",   ID_FILE_RUN_REQUEST_AUTO
-        MENUITEM "&Pause",                      ID_FILE_RUN_REQUEST_NEVER
+        MENUITEM "&Suspend",                    ID_FILE_RUN_REQUEST_NEVER
         MENUITEM SEPARATOR
         MENUITEM "Run &Benchmarks",             ID_FILE_RUN_BENCHMARKS
         MENUITEM SEPARATOR
@@ -224,14 +224,14 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "Force &run",                  ID_FILE_RUN_REQUEST_ALWAYS
         MENUITEM "Run based on &preferences",   ID_FILE_RUN_REQUEST_AUTO
-        MENUITEM "&Pause",                      ID_FILE_RUN_REQUEST_NEVER
+        MENUITEM "&Suspend",                    ID_FILE_RUN_REQUEST_NEVER
         MENUITEM SEPARATOR
         MENUITEM "E&xit",                       ID_STATUSICON_EXIT
     END
     POPUP "Project"
     BEGIN
         MENUITEM "&Web site",                   ID_PROJECT_WEB_SITE
-        MENUITEM "GET PREFERENCES",             ID_PROJECT_GET_PREFS
+        MENUITEM "XXX GET PREFERENCES XXX",     ID_PROJECT_GET_PREFS
         MENUITEM "&Detach...",                  ID_PROJECT_DETACH
         MENUITEM "&Reset project...",           ID_PROJECT_RESET
     END
@@ -243,7 +243,7 @@ BEGIN
     BEGIN
         MENUITEM "&Retry now",                  ID_TRANSFERS_RETRYNOW
     END
-    POPUP "Message"
+    POPUP "Messages"
     BEGIN
         MENUITEM "&Copy to clipboard",          ID_MESSAGE_COPY_TO_CLIP
     END

client/win/wingui_dialog.cpp

@@ -62,7 +62,7 @@ BOOL CLoginDialog::OnInitDialog()
 {
     CDialog::OnInitDialog();
 	m_strUrlTT.Format("The URL for the website of the project.");
-	m_strAuthTT.Format("The authorization code recieved in your confirmation email.");
+	m_strAuthTT.Format("The authorization code received in your confirmation email.");
 	LoadLanguage();
 	CWnd* pWndUrl = GetDlgItem(IDC_LOGIN_URL);
 	if(pWndUrl) {

client/win/wingui_mainwindow.cpp

@@ -185,6 +185,8 @@ CMainWindow::CMainWindow()
 
 	m_MenuLabelRetryNow = "&Retry now";
 	m_MenuLabelGetPreferences = "Get p&references";
+	m_DialogResetQuery = "Are you sure you want to reset the project %1?";
+	m_DialogDetachQuery = "Are you sure you want to detach from the project %1?";
 
 	// create and position window
     CreateEx(0, wndcls.lpszClassName, WND_TITLE,
@@ -986,6 +988,9 @@ void CMainWindow::LoadLanguage()
 
 	UpdateLanguageString("MENU-Project", m_MenuLabelGetPreferences, strPath);
 	UpdateLanguageString("MENU-Project", m_MenuLabelRetryNow, strPath);
+
+	UpdateLanguageString("DIALOG-RESET", m_DialogResetQuery, strPath);
+	UpdateLanguageString("DIALOG-DETACH", m_DialogDetachQuery, strPath);
 }
 
 //////////
@@ -1267,11 +1272,10 @@ void CMainWindow::OnCommandProjectGetPrefs()
 void CMainWindow::OnCommandProjectDetach()
 {
 	PROJECT *proj;
-	CString strBuf;
 	proj = GetProjectFromContextMenu();
 	if (!proj) return;
-	strBuf.Format("Are you sure you want to detach from the project %s?",
+	CString strBuf = m_DialogDetachQuery;
-		proj->get_project_name());
+	strBuf.Replace("%1", proj->get_project_name());
 	if(AfxMessageBox(strBuf, MB_YESNO, 0) == IDYES) DetachProject(proj);
 }
 
@@ -1293,11 +1297,10 @@ void CMainWindow::DetachProject(PROJECT *proj) {
 void CMainWindow::OnCommandProjectReset()
 {
 	PROJECT *proj;
-	CString strBuf;
 	proj = GetProjectFromContextMenu();
 	if (!proj) return;
-	strBuf.Format("Are you sure you want to reset the project %s?",
+	CString strBuf = m_DialogResetQuery;
-		proj->get_project_name());
+	strBuf.Replace("%1", proj->get_project_name());
 	if(AfxMessageBox(strBuf, MB_YESNO, 0) == IDYES) {
 		gstate.reset_project(proj);
 	}

client/win/wingui_mainwindow.h

@@ -170,6 +170,7 @@ protected:
 	afx_msg void			OnTimer(UINT); 
 
 	CString m_MenuLabelRetryNow, m_MenuLabelGetPreferences;
+	CString m_DialogResetQuery, m_DialogDetachQuery;
 
     DECLARE_MESSAGE_MAP()