From 6b431b47917e524de479f4c93b8baac6b246977e Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Sun, 26 Feb 2017 13:03:38 +0100 Subject: [PATCH] Fix transaltion issue. Rebuild dialog_display_options_base with a recent wxFormbuilder version. --- eeschema/widgets/widget_eeschema_color_config.cpp | 2 +- pcbnew/dialogs/dialog_display_options_base.cpp | 2 +- pcbnew/dialogs/dialog_display_options_base.fbp | 4 ++-- pcbnew/dialogs/dialog_display_options_base.h | 2 +- pcbnew/pcbnew_config.cpp | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eeschema/widgets/widget_eeschema_color_config.cpp b/eeschema/widgets/widget_eeschema_color_config.cpp index b316aa9715..f8eabad0df 100644 --- a/eeschema/widgets/widget_eeschema_color_config.cpp +++ b/eeschema/widgets/widget_eeschema_color_config.cpp @@ -104,7 +104,7 @@ static BUTTONINDEX buttonGroups[] = { { wxT( "" ), NULL } }; -static COLORBUTTON bgColorButton = { _( "" ), LAYER_BACKGROUND }; +static COLORBUTTON bgColorButton = { "", LAYER_BACKGROUND }; static COLOR4D currentColors[ LAYERSCH_ID_COUNT ]; diff --git a/pcbnew/dialogs/dialog_display_options_base.cpp b/pcbnew/dialogs/dialog_display_options_base.cpp index db2a7b4e86..4ba3706e55 100644 --- a/pcbnew/dialogs/dialog_display_options_base.cpp +++ b/pcbnew/dialogs/dialog_display_options_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jan 9 2017) +// C++ code generated with wxFormBuilder (version May 6 2016) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! diff --git a/pcbnew/dialogs/dialog_display_options_base.fbp b/pcbnew/dialogs/dialog_display_options_base.fbp index 0ec8d3c9ae..8b659a6eca 100644 --- a/pcbnew/dialogs/dialog_display_options_base.fbp +++ b/pcbnew/dialogs/dialog_display_options_base.fbp @@ -642,7 +642,7 @@ 0 - + 0 0 @@ -983,7 +983,7 @@ 0 - + 0 0 diff --git a/pcbnew/dialogs/dialog_display_options_base.h b/pcbnew/dialogs/dialog_display_options_base.h index 7dc31703c0..92ad296c7f 100644 --- a/pcbnew/dialogs/dialog_display_options_base.h +++ b/pcbnew/dialogs/dialog_display_options_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jan 9 2017) +// C++ code generated with wxFormBuilder (version May 6 2016) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! diff --git a/pcbnew/pcbnew_config.cpp b/pcbnew/pcbnew_config.cpp index 889fa46f67..da954bc50b 100644 --- a/pcbnew/pcbnew_config.cpp +++ b/pcbnew/pcbnew_config.cpp @@ -87,7 +87,7 @@ void PCB_EDIT_FRAME::Process_Config( wxCommandEvent& event ) GetMenuBar()->SetLabel( ID_MENU_PCB_SHOW_HIDE_MUWAVE_TOOLBAR, m_show_microwave_tools ? - _( "Hide Microwave Toolbar" ): _( "Show Microwave Toolbar" )); + _( "Hide Microwa&ve Toolbar" ): _( "Show Microwa&ve Toolbar" )); break;