haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix localization of the menu strings with accelerator strings 

The accelerator strings really shouldn't be part of the translation,
and some translations have cause the accelerator keys to be incorrectly
handled. It is simpler to make it separate and just join them to the
translated string.

Make all accelerator modifiers use lowercased Ctrl instead of CTRL
to be the same as the other modifiers.

Fixes https://gitlab.com/kicad/code/kicad/issues/5992
This commit is contained in:
Ian McInerney 2020-11-04 01:28:55 +00:00
parent dd84ec1b51
commit 3d47eb0d49
11 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3d-viewer/3d_viewer/3d_menubar.cpp
View File

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

8
common/grid_tricks.cpp
View File

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

6
common/tool/action_menu.cpp
View File

@ -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 );
}

2
cvpcb/menubar.cpp
View File

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

2
eeschema/menubar.cpp
View File

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

2
eeschema/symbol_editor/menubar_symbol_editor.cpp
View File

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

2
gerbview/menubar.cpp
View File

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

2
kicad/menubar.cpp
View File

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

2
pagelayout_editor/menubar.cpp
View File

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

2
pcbnew/menubar_footprint_editor.cpp
View File

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

2
pcbnew/menubar_pcb_editor.cpp
View File

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