Use generic Save (and New and Open) commands where unambiguous.

Fixes: lp:1743426
* https://bugs.launchpad.net/kicad/+bug/1743426

eeschema/menubar.cpp

@@ -304,14 +304,14 @@ void prepareFilesMenu( wxMenu* aParentMenu, bool aIsOutsideProject )
     {
         AddMenuItem( aParentMenu,
                      ID_NEW_PROJECT,
-                     _( "&New Schematic Project" ),
+                     _( "&New" ),
                      _( "Clear current schematic hierarchy and start new schematic root sheet" ),
                      KiBitmap( new_document_xpm ) );
 
-        text = AddHotkeyName( _( "&Open Schematic Project" ), g_Schematic_Hokeys_Descr, HK_LOAD_SCH );
+        text = AddHotkeyName( _( "&Open" ), g_Schematic_Hokeys_Descr, HK_LOAD_SCH );
         AddMenuItem( aParentMenu,
                      ID_LOAD_PROJECT, text,
-                     _( "Open existing schematic hierarchy" ),
+                     _( "Open existing schematic" ),
                      KiBitmap( open_document_xpm ) );
     }
 
@@ -333,8 +333,8 @@ void prepareFilesMenu( wxMenu* aParentMenu, bool aIsOutsideProject )
     {
         AddMenuItem( aParentMenu, openRecentMenu,
                      wxID_ANY, _( "Open &Recent" ),
-                     _( "Open recent opened schematic project" ),
+                     _( "Open recently opened schematic" ),
-                     KiBitmap( open_project_xpm ) );
+                     KiBitmap( recent_xpm ) );
     }
 
     AddMenuItem( aParentMenu,
@@ -349,16 +349,16 @@ void prepareFilesMenu( wxMenu* aParentMenu, bool aIsOutsideProject )
 
     aParentMenu->AppendSeparator();
 
-    text = AddHotkeyName( _( "&Save Schematic Project" ),
+    text = AddHotkeyName( _( "&Save" ),
                           g_Schematic_Hokeys_Descr, HK_SAVE_SCH );
     AddMenuItem( aParentMenu,
                  ID_SAVE_PROJECT, text,
-                 _( "Save all sheets in schematic project" ),
+                 _( "Save all sheets in schematic" ),
-                 KiBitmap( save_project_xpm ) );
+                 KiBitmap( save_xpm ) );
 
     AddMenuItem( aParentMenu,
                  ID_UPDATE_ONE_SHEET,
-                 _( "Save &Current Sheet Only" ),
+                 _( "Save &Current Sheet" ),
                  _( "Save only current schematic sheet" ),
                  KiBitmap( save_xpm ) );
 

eeschema/tool_sch.cpp

@@ -56,17 +56,18 @@ void SCH_EDIT_FRAME::ReCreateHToolbar()
     if( Kiface().IsSingle() )   // not when under a project mgr
     {
         // These 2 menus have meaning only outside a project, i.e. not under a project manager:
-        m_mainToolBar->AddTool( ID_NEW_PROJECT, wxEmptyString, KiScaledBitmap( new_document_xpm, this ),
+        m_mainToolBar->AddTool( ID_NEW_PROJECT, wxEmptyString,
-                                _( "New schematic project" ) );
+                                KiScaledBitmap( new_document_xpm, this ),
+                                _( "New schematic" ) );
 
         m_mainToolBar->AddTool( ID_LOAD_PROJECT, wxEmptyString,
                                 KiScaledBitmap( open_document_xpm, this ),
-                                _( "Open schematic project" ) );
+                                _( "Open schematic" ) );
     }
 
     m_mainToolBar->AddTool( ID_SAVE_PROJECT, wxEmptyString,
-                            KiScaledBitmap( save_project_xpm, this ),
+                            KiScaledBitmap( save_xpm, this ),
-                            _( "Save schematic project" ) );
+                            _( "Save (all sheets)" ) );
 
     KiScaledSeparator( m_mainToolBar, this );
 

gerbview/menubar.cpp

@@ -98,7 +98,7 @@ void GERBVIEW_FRAME::ReCreateMenuBar()
 
     AddMenuItem( fileMenu, openRecentGbrMenu, wxID_ANY,
                  _( "Open &Recent Gerber File" ),
-                 _( "Open a recent opened Gerber file" ),
+                 _( "Open a recently opened Gerber file" ),
                  KiBitmap( recent_xpm ) );
 
     // Recent drill files
@@ -112,7 +112,7 @@ void GERBVIEW_FRAME::ReCreateMenuBar()
     m_drillFileHistory.AddFilesToMenu( );
     AddMenuItem( fileMenu, openRecentDrlMenu, wxID_ANY,
                  _( "Open Recent Dri&ll File" ),
-                 _( "Open a recent opened drill file" ),
+                 _( "Open a recently opened drill file" ),
                  KiBitmap( recent_xpm ) );
 
     // Recent drill files
@@ -126,7 +126,7 @@ void GERBVIEW_FRAME::ReCreateMenuBar()
     m_zipFileHistory.AddFilesToMenu( );
     AddMenuItem( fileMenu, openRecentZipArchiveMenu, wxID_ANY,
                  _( "Open Recent Zip &Archive File" ),
-                 _( "Open a recent opened zip archive file" ),
+                 _( "Open a recently opened zip archive file" ),
                  KiBitmap( recent_xpm ) );
 
     // Recent job files
@@ -140,7 +140,7 @@ void GERBVIEW_FRAME::ReCreateMenuBar()
     m_jobFileHistory.AddFilesToMenu( );
     AddMenuItem( fileMenu, openRecentJobFilesMenu, wxID_ANY,
                  _( "Open Recent &Job File" ),
-                 _( "Open a recent opened gerber job file" ),
+                 _( "Open a recently opened gerber job file" ),
                  KiBitmap( recent_xpm ) );
 
     // Separator

kicad/class_treeprojectfiles.cpp

@@ -57,7 +57,7 @@ TREEPROJECTFILES::TREEPROJECTFILES( TREE_PROJECT_FRAME* parent ) :
     // Make an image list containing small icons
     m_ImageList = new wxImageList( iconsize.x, iconsize.y, true, TREE_MAX );
 
-    m_ImageList->Add( KiBitmap( kicad_icon_small_xpm ) );       // TREE_PROJECT
+    m_ImageList->Add( KiBitmap( new_project_xpm ) );            // TREE_PROJECT
     m_ImageList->Add( KiBitmap( eeschema_xpm ) );               // TREE_SCHEMA
     m_ImageList->Add( KiBitmap( pcbnew_xpm ) );                 // TREE_LEGACY_PCB
     m_ImageList->Add( KiBitmap( pcbnew_xpm ) );                 // TREE_SFMT_PCB

pcbnew/menubar_pcbframe.cpp

@@ -628,13 +628,13 @@ void prepareFilesMenu( wxMenu* aParentMenu, bool aIsOutsideProject )
     if( aIsOutsideProject )
     {
         AddMenuItem( aParentMenu, ID_NEW_BOARD,
-                _( "&New Board" ),
+                _( "&New" ),
                 _( "Create new board" ),
                 KiBitmap( new_board_xpm ) );
 
-        text = AddHotkeyName( _( "&Open Board" ), g_Pcbnew_Editor_Hokeys_Descr, HK_LOAD_BOARD );
+        text = AddHotkeyName( _( "&Open" ), g_Pcbnew_Editor_Hokeys_Descr, HK_LOAD_BOARD );
         AddMenuItem( aParentMenu, ID_LOAD_FILE, text,
-                _( "Load existing board" ),
+                _( "Open existing board" ),
                 KiBitmap( open_brd_file_xpm ) );
     }
 
@@ -658,7 +658,7 @@ void prepareFilesMenu( wxMenu* aParentMenu, bool aIsOutsideProject )
         AddMenuItem( aParentMenu, openRecentMenu,
                      -1, _( "Open &Recent" ),
                      _( "Open recently opened board" ),
-                     KiBitmap( open_project_xpm ) );
+                     KiBitmap( recent_xpm ) );
 
         AddMenuItem( aParentMenu, ID_APPEND_FILE,
                      _( "&Append Board" ),