diff --git a/3d-viewer/3d_viewer/3d_menubar.cpp b/3d-viewer/3d_viewer/3d_menubar.cpp
index 4f6e2fb7ef..ab9edc7d2f 100644
--- a/3d-viewer/3d_viewer/3d_menubar.cpp
+++ b/3d-viewer/3d_viewer/3d_menubar.cpp
@@ -210,7 +210,7 @@ void EDA_3D_VIEWER::CreateMenuBar()
     prefsMenu->Add( _( "Reset to Default Settings" ), ID_MENU3D_RESET_DEFAULTS, tools_xpm );
 
 #ifdef __APPLE__    // Note: will get moved to Apple menu by wxWidgets
-    prefsMenu->Add( _( "Preferences...\tCTRL+," ),
+    prefsMenu->Add( _( "Preferences..." ) + "\tCtrl+,",
                     _( "Show preferences for all open tools" ),
                     wxID_PREFERENCES,
                     preference_xpm );
diff --git a/common/grid_tricks.cpp b/common/grid_tricks.cpp
index db89da29a4..b7667a4de8 100644
--- a/common/grid_tricks.cpp
+++ b/common/grid_tricks.cpp
@@ -237,10 +237,10 @@ void GRID_TRICKS::onGridLabelRightClick( wxGridEvent&  )
 
 void GRID_TRICKS::showPopupMenu( wxMenu& menu )
 {
-    menu.Append( GRIDTRICKS_ID_CUT,    _( "Cut\tCTRL+X" ),         _( "Clear selected cells placing original contents on clipboard" ) );
-    menu.Append( GRIDTRICKS_ID_COPY,   _( "Copy\tCTRL+C" ),        _( "Copy selected cells to clipboard" ) );
-    menu.Append( GRIDTRICKS_ID_PASTE,  _( "Paste\tCTRL+V" ),       _( "Paste clipboard cells to matrix at current cell" ) );
-    menu.Append( GRIDTRICKS_ID_SELECT, _( "Select All\tCTRL+A" ),  _( "Select all cells" ) );
+    menu.Append( GRIDTRICKS_ID_CUT,    _( "Cut" ) + "\tCtrl+X",         _( "Clear selected cells placing original contents on clipboard" ) );
+    menu.Append( GRIDTRICKS_ID_COPY,   _( "Copy" ) + "\tCtrl+C",        _( "Copy selected cells to clipboard" ) );
+    menu.Append( GRIDTRICKS_ID_PASTE,  _( "Paste" ) + "\tCtrl+V",       _( "Paste clipboard cells to matrix at current cell" ) );
+    menu.Append( GRIDTRICKS_ID_SELECT, _( "Select All" ) + "\tCtrl+A",  _( "Select all cells" ) );
 
     getSelectedArea();
 
diff --git a/common/tool/action_menu.cpp b/common/tool/action_menu.cpp
index 0678b39f72..bc13c652f6 100644
--- a/common/tool/action_menu.cpp
+++ b/common/tool/action_menu.cpp
@@ -202,8 +202,8 @@ wxMenuItem* ACTION_MENU::Add( ACTION_MENU* aMenu )
 
 void ACTION_MENU::AddClose( wxString aAppname )
 {
-    Add( _( "Close\tCTRL+W" ),
-         wxString::Format( "Close %s", aAppname ),
+    Add( _( "Close" ) + "\tCtrl+W",
+         wxString::Format( _( "Close %s" ), aAppname ),
          wxID_CLOSE,
          exit_xpm );
 }
@@ -216,7 +216,7 @@ void ACTION_MENU::AddQuitOrClose( KIFACE_I* aKiface, wxString aAppname )
         // Don't use ACTIONS::quit; wxWidgets moves this on OSX and expects to find it via
         // wxID_EXIT
         Add( _( "Quit" ),
-             wxString::Format( "Quit %s", aAppname ),
+             wxString::Format( _( "Quit %s" ), aAppname ),
              wxID_EXIT,
              exit_xpm );
     }
diff --git a/cvpcb/menubar.cpp b/cvpcb/menubar.cpp
index d5339634b2..936a2c8319 100644
--- a/cvpcb/menubar.cpp
+++ b/cvpcb/menubar.cpp
@@ -68,7 +68,7 @@ void CVPCB_MAINFRAME::ReCreateMenuBar()
 
     prefsMenu->Add( ACTIONS::configurePaths );
     prefsMenu->Add( ACTIONS::showFootprintLibTable );
-    prefsMenu->Add( _( "Preferences...\tCTRL+," ),
+    prefsMenu->Add( _( "Preferences..." ) + "\tCtrl+,",
                     _( "Show preferences for all open tools" ),
                     wxID_PREFERENCES,
                     preference_xpm );
diff --git a/eeschema/menubar.cpp b/eeschema/menubar.cpp
index e2111538ea..928a3d153e 100644
--- a/eeschema/menubar.cpp
+++ b/eeschema/menubar.cpp
@@ -261,7 +261,7 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
 
     prefsMenu->Add( ACTIONS::configurePaths );
     prefsMenu->Add( ACTIONS::showSymbolLibTable );
-    prefsMenu->Add( _( "Preferences...\tCTRL+," ),
+    prefsMenu->Add( _( "Preferences..." ) + "\tCtrl+,",
                     _( "Show preferences for all open tools" ),
                     wxID_PREFERENCES,
                     preference_xpm );
diff --git a/eeschema/symbol_editor/menubar_symbol_editor.cpp b/eeschema/symbol_editor/menubar_symbol_editor.cpp
index 2b8f651637..ed91af6511 100644
--- a/eeschema/symbol_editor/menubar_symbol_editor.cpp
+++ b/eeschema/symbol_editor/menubar_symbol_editor.cpp
@@ -158,7 +158,7 @@ void SYMBOL_EDIT_FRAME::ReCreateMenuBar()
 
     prefsMenu->Add( ACTIONS::configurePaths );
     prefsMenu->Add( ACTIONS::showSymbolLibTable );
-    prefsMenu->Add( _( "Preferences...\tCTRL+," ),
+    prefsMenu->Add( _( "Preferences..." ) + "\tCtrl+,",
                     _( "Show preferences for all open tools" ),
                     wxID_PREFERENCES,
                     preference_xpm );
diff --git a/gerbview/menubar.cpp b/gerbview/menubar.cpp
index 31c6cd6a54..8d950fc684 100644
--- a/gerbview/menubar.cpp
+++ b/gerbview/menubar.cpp
@@ -209,7 +209,7 @@ void GERBVIEW_FRAME::ReCreateMenuBar()
     //
     ACTION_MENU* preferencesMenu = new ACTION_MENU( false, selTool );
 
-    preferencesMenu->Add( _( "Preferences...\tCTRL+," ),
+    preferencesMenu->Add( _( "Preferences..." ) + "\tCtrl+,",
                           _( "Show preferences for all open tools" ),
                           wxID_PREFERENCES,
                           preference_xpm );
diff --git a/kicad/menubar.cpp b/kicad/menubar.cpp
index cdccbf7c7b..d6b217a993 100644
--- a/kicad/menubar.cpp
+++ b/kicad/menubar.cpp
@@ -162,7 +162,7 @@ void KICAD_MANAGER_FRAME::ReCreateMenuBar()
     prefsMenu->Add( ACTIONS::configurePaths );
     prefsMenu->Add( ACTIONS::showSymbolLibTable );
     prefsMenu->Add( ACTIONS::showFootprintLibTable );
-    prefsMenu->Add( _( "Preferences...\tCTRL+," ),
+    prefsMenu->Add( _( "Preferences..." ) + "\tCtrl+,",
                     _( "Show preferences for all open tools" ),
                     wxID_PREFERENCES,
                     preference_xpm );
diff --git a/pagelayout_editor/menubar.cpp b/pagelayout_editor/menubar.cpp
index c148b85c75..356387bff3 100644
--- a/pagelayout_editor/menubar.cpp
+++ b/pagelayout_editor/menubar.cpp
@@ -153,7 +153,7 @@ void PL_EDITOR_FRAME::ReCreateMenuBar()
     //
     ACTION_MENU* preferencesMenu = new ACTION_MENU( false, selTool );
 
-    preferencesMenu->Add( _( "Preferences...\tCTRL+," ),
+    preferencesMenu->Add( _( "Preferences..." ) + "\tCtrl+,",
                           _( "Show preferences for all open tools" ),
                           wxID_PREFERENCES,
                           preference_xpm );
diff --git a/pcbnew/menubar_footprint_editor.cpp b/pcbnew/menubar_footprint_editor.cpp
index 60f0eb2e45..2bbdcda4ea 100644
--- a/pcbnew/menubar_footprint_editor.cpp
+++ b/pcbnew/menubar_footprint_editor.cpp
@@ -228,7 +228,7 @@ void FOOTPRINT_EDIT_FRAME::ReCreateMenuBar()
 
     prefsMenu->Add( ACTIONS::configurePaths );
     prefsMenu->Add( ACTIONS::showFootprintLibTable );
-    prefsMenu->Add( _( "Preferences...\tCTRL+," ),
+    prefsMenu->Add( _( "Preferences..." ) + "\tCtrl+,",
                     _( "Show preferences for all open tools" ),
                     wxID_PREFERENCES,
                     preference_xpm );
diff --git a/pcbnew/menubar_pcb_editor.cpp b/pcbnew/menubar_pcb_editor.cpp
index cd3fac5a5d..55fb2562f5 100644
--- a/pcbnew/menubar_pcb_editor.cpp
+++ b/pcbnew/menubar_pcb_editor.cpp
@@ -431,7 +431,7 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
     prefsMenu->Add( ACTIONS::configurePaths );
     prefsMenu->Add( ACTIONS::showFootprintLibTable );
 
-    prefsMenu->Add( _( "Preferences...\tCTRL+," ),
+    prefsMenu->Add( _( "Preferences..." ) + "\tCtrl+,",
                     _( "Show preferences for all open tools" ),
                     wxID_PREFERENCES,
                     preference_xpm );