From 2bb0bc8829a983108fc75291d4d7ab78cafbbfd4 Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Thu, 12 Mar 2015 09:47:39 -0700
Subject: [PATCH] Manager: menu tweaks

---
 clientgui/AdvancedFrame.cpp       | 18 +++++++++---------
 clientgui/sg_BoincSimpleFrame.cpp |  6 ++----
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/clientgui/AdvancedFrame.cpp b/clientgui/AdvancedFrame.cpp
index 59ddb5e8b1..2e9a58dc95 100644
--- a/clientgui/AdvancedFrame.cpp
+++ b/clientgui/AdvancedFrame.cpp
@@ -322,11 +322,11 @@ bool CAdvancedFrame::CreateMenu() {
     wxMenu *menuFile = new wxMenu;
 
     strMenuName.Printf(
-        _("New %s Window..."), 
+        _("New %s window..."), 
         pSkinAdvanced->GetApplicationName().c_str()
     );
     strMenuDescription.Printf(
-        _("Open another %s Window"), 
+        _("Open another %s window"), 
         pSkinAdvanced->GetApplicationName().c_str()
     );
     menuFile->Append(
@@ -337,12 +337,12 @@ bool CAdvancedFrame::CreateMenu() {
 
     menuFile->Append(
         ID_SELECTCOMPUTER, 
-        _("Select Computer..."),
+        _("Select computer..."),
         _("Connect to a BOINC client on another computer")
     );
     menuFile->Append(
         ID_SHUTDOWNCORECLIENT, 
-        _("Shut Down Connected Client..."),
+        _("Shut down connected client..."),
         _("Shut down the currently connected BOINC client")
     );
     menuFile->AppendSeparator();
@@ -351,7 +351,7 @@ bool CAdvancedFrame::CreateMenu() {
         _("Close the %s window"), 
         pSkinAdvanced->GetApplicationName().c_str()
     );
-    strMenuName = _("&Close Window");
+    strMenuName = _("&Close window");
     strMenuName += wxT("\tCtrl+W");
     menuFile->Append(
         ID_CLOSEWINDOW,
@@ -491,7 +491,7 @@ bool CAdvancedFrame::CreateMenu() {
     );
     menuTools->Append(
         ID_RETRYCOMMUNICATIONS, 
-        _("Retry Pending Transfers"),
+        _("Retry pending transfers"),
         _("Retry deferred file transfers and task requests")
     );
 
@@ -603,17 +603,17 @@ bool CAdvancedFrame::CreateMenu() {
     menuOptions->AppendSeparator();
     menuOptions->Append(
 		ID_SELECTCOLUMNS,
-        _("Select Columns..."),
+        _("Select columns..."),
         _("Select which columns to display")
     );
     menuOptions->Append(
 		ID_DIAGNOSTICLOGFLAGS,
-        _("Event Log Options...\tCtrl+Shift+F"),
+        _("Event Log options...\tCtrl+Shift+F"),
         _("Enable or disable various diagnostic messages")
     );
     menuOptions->Append(
         ID_OPTIONS, 
-        _("&Other Options..."),
+        _("&Other options..."),
         _("Configure display options and network settings")
     );
     menuOptions->AppendSeparator();
diff --git a/clientgui/sg_BoincSimpleFrame.cpp b/clientgui/sg_BoincSimpleFrame.cpp
index fb55fbd175..57a821fb77 100755
--- a/clientgui/sg_BoincSimpleFrame.cpp
+++ b/clientgui/sg_BoincSimpleFrame.cpp
@@ -114,13 +114,11 @@ CSimpleFrame::CSimpleFrame(wxString title, wxIconBundle* icons, wxPoint position
     // File menu
     wxMenu *menuFile = new wxMenu;
 
-    // %s is the application name
-    //    i.e. 'BOINC Manager', 'GridRepublic Manager'
     strMenuDescription.Printf(
         _("Close the %s window"), 
         pSkinAdvanced->GetApplicationName().c_str()
     );
-    strMenuName = _("&Close Window");
+    strMenuName = _("&Close window");
     strMenuName += wxT("\tCtrl+W");
     menuFile->Append(
         ID_CLOSEWINDOW,
@@ -199,7 +197,7 @@ CSimpleFrame::CSimpleFrame(wxString title, wxIconBundle* icons, wxPoint position
     
     menuTools->Append(
         ID_SGOPTIONS, 
-        _("&Other Options..."),
+        _("&Other options..."),
         _("Configure display options and proxy settings")
     );