From 9c0c89256e08a5130f3b200336d4dc6bef65af53 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Tue, 14 Apr 2015 19:44:19 +0200 Subject: [PATCH] Make hotkeys editor titles translatable. --- common/dialogs/dialog_hotkeys_editor.cpp | 2 +- common/hotkeys_basic.cpp | 10 +++++----- kicad/menubar.cpp | 6 ++++-- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/common/dialogs/dialog_hotkeys_editor.cpp b/common/dialogs/dialog_hotkeys_editor.cpp index b8fa262ef6..a0207e6ad0 100644 --- a/common/dialogs/dialog_hotkeys_editor.cpp +++ b/common/dialogs/dialog_hotkeys_editor.cpp @@ -275,7 +275,7 @@ HOTKEYS_EDITOR_DIALOG::HOTKEYS_EDITOR_DIALOG( EDA_BASE_FRAME* aParent, for( section = m_hotkeys; section->m_HK_InfoList; section++ ) { m_hotkeySectionPages.push_back( new HOTKEY_SECTION_PAGE( this, m_hotkeySections, - _( *section->m_Title ), + wxGetTranslation( *section->m_Title ), section ) ); } diff --git a/common/hotkeys_basic.cpp b/common/hotkeys_basic.cpp index 6676162a6e..40e3d3d038 100644 --- a/common/hotkeys_basic.cpp +++ b/common/hotkeys_basic.cpp @@ -52,11 +52,11 @@ wxString g_LibEditSectionTag( wxT( "[libedit]" ) ); wxString g_BoardEditorSectionTag( wxT( "[pcbnew]" ) ); wxString g_ModuleEditSectionTag( wxT( "[footprinteditor]" ) ); -wxString g_CommonSectionTitle( wxT( "Common" ) ); -wxString g_SchematicSectionTitle( wxT( "Schematic Editor" ) ); -wxString g_LibEditSectionTitle( wxT( "Library Editor" ) ); -wxString g_BoardEditorSectionTitle( wxT( "Board Editor" ) ); -wxString g_ModuleEditSectionTitle( wxT( "Footprint Editor" ) ); +wxString g_CommonSectionTitle( _HKI( "Common" ) ); +wxString g_SchematicSectionTitle( _HKI( "Schematic Editor" ) ); +wxString g_LibEditSectionTitle( _HKI( "Library Editor" ) ); +wxString g_BoardEditorSectionTitle( _HKI( "Board Editor" ) ); +wxString g_ModuleEditSectionTitle( _HKI( "Footprint Editor" ) ); /* Class to handle hotkey commnands. hotkeys have a default value diff --git a/kicad/menubar.cpp b/kicad/menubar.cpp index 5af5b70ba8..d523e88655 100644 --- a/kicad/menubar.cpp +++ b/kicad/menubar.cpp @@ -167,9 +167,11 @@ EDA_HOTKEY* common_Hotkey_List[] = // list of sections and corresponding hotkey list for Kicad // (used to create an hotkey config file, and edit hotkeys ) // here we have only one section. +wxString sectionTitle( _HKI( "Kicad Manager Hotkeys" ) ); + struct EDA_HOTKEY_CONFIG kicad_Manager_Hokeys_Descr[] = { - { &g_CommonSectionTag, common_Hotkey_List, &g_CommonSectionTitle }, - { NULL, NULL, NULL } + { &g_CommonSectionTag, common_Hotkey_List, §ionTitle }, + { NULL, NULL, NULL } }; ///////////// End hotkeys management ///////////////////////////////////////