From 6bd8fa1dd767ea90ab9276fc240570718a1d8255 Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 19 Apr 2015 13:07:31 +0200 Subject: [PATCH] Fix I18n issues --- eeschema/hotkeys.cpp | 10 +++++----- eeschema/menubar.cpp | 6 +++--- pagelayout_editor/hotkeys.cpp | 2 +- pagelayout_editor/pl_editor_frame.cpp | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eeschema/hotkeys.cpp b/eeschema/hotkeys.cpp index 6cd2bf5ed9..c833cba56e 100644 --- a/eeschema/hotkeys.cpp +++ b/eeschema/hotkeys.cpp @@ -323,15 +323,15 @@ struct EDA_HOTKEY_CONFIG g_Eeschema_Hokeys_Descr[] = { { &g_CommonSectionTag, common_Hotkey_List, &commonSectionTitle }, { &schematicSectionTag, schematic_Hotkey_List, &schematicSectionTitle }, - { &libEditSectionTag, libEdit_Hotkey_List, &schematicSectionTitle }, - { NULL, NULL, NULL } + { &libEditSectionTag, libEdit_Hotkey_List, &libEditSectionTitle }, + { NULL, NULL, NULL } }; // list of sections and corresponding hotkey list for the schematic editor // (used to list current hotkeys) struct EDA_HOTKEY_CONFIG g_Schematic_Hokeys_Descr[] = { - { &g_CommonSectionTag, common_Hotkey_List, &commonSectionTitle }, + { &g_CommonSectionTag, common_Hotkey_List, &commonSectionTitle }, { &schematicSectionTitle, schematic_Hotkey_List, &schematicSectionTitle }, { NULL, NULL, NULL } }; @@ -340,8 +340,8 @@ struct EDA_HOTKEY_CONFIG g_Schematic_Hokeys_Descr[] = // (used to list current hotkeys) struct EDA_HOTKEY_CONFIG g_Libedit_Hokeys_Descr[] = { - { &g_CommonSectionTag, common_Hotkey_List, &commonSectionTitle }, - { &libEditSectionTag, libEdit_Hotkey_List, &schematicSectionTitle }, + { &g_CommonSectionTag, common_Hotkey_List, &commonSectionTitle }, + { &libEditSectionTag, libEdit_Hotkey_List, &libEditSectionTitle }, { NULL, NULL, NULL } }; diff --git a/eeschema/menubar.cpp b/eeschema/menubar.cpp index ff9598c73a..26957253c2 100644 --- a/eeschema/menubar.cpp +++ b/eeschema/menubar.cpp @@ -335,7 +335,7 @@ void SCH_EDIT_FRAME::ReCreateMenuBar() KiBitmap( add_hierarchical_label_xpm ) ); - text = AddHotkeyName( _( "H&ierarchical &Sheet" ), g_Schematic_Hokeys_Descr, + text = AddHotkeyName( _( "Hierarchical &Sheet" ), g_Schematic_Hokeys_Descr, HK_ADD_HIER_SHEET, IS_ACCELERATOR ); // add an accelerator, not a shortcut AddMenuItem( placeMenu, ID_SHEET_SYMBOL_BUTT, text, HELP_PLACE_SHEET, @@ -355,13 +355,13 @@ void SCH_EDIT_FRAME::ReCreateMenuBar() placeMenu->AppendSeparator(); - text = AddHotkeyName( _( "Graphic Polyline" ), g_Schematic_Hokeys_Descr, + text = AddHotkeyName( _( "Graphic Pol&yline" ), g_Schematic_Hokeys_Descr, HK_ADD_GRAPHIC_POLYLINE, IS_ACCELERATOR ); // add an accelerator, not a shortcut AddMenuItem( placeMenu, ID_LINE_COMMENT_BUTT, text, HELP_PLACE_GRAPHICLINES, KiBitmap( add_dashed_line_xpm ) ); - text = AddHotkeyName( _( "Graphic Text" ), g_Schematic_Hokeys_Descr, + text = AddHotkeyName( _( "Graphic &Text" ), g_Schematic_Hokeys_Descr, HK_ADD_GRAPHIC_TEXT, IS_ACCELERATOR ); // add an accelerator, not a shortcut AddMenuItem( placeMenu, ID_TEXT_COMMENT_BUTT, text, HELP_PLACE_GRAPHICTEXTS, diff --git a/pagelayout_editor/hotkeys.cpp b/pagelayout_editor/hotkeys.cpp index 8b1218e992..72f5e7a0ee 100644 --- a/pagelayout_editor/hotkeys.cpp +++ b/pagelayout_editor/hotkeys.cpp @@ -116,7 +116,7 @@ static wxString commonSectionTitle( _HKI( "Common" ) ); // list of sections and corresponding hotkey list for Pl_Editor // (used to create an hotkey config file) static wxString s_PlEditorSectionTag( wxT( "[pl_editor]" ) ); -static wxString s_PlEditorSectionTitle( wxT( "Part Layout Editor" ) ); +static wxString s_PlEditorSectionTitle( _HKI( "Page Layout Editor" ) ); struct EDA_HOTKEY_CONFIG s_PlEditor_Hokeys_Descr[] = { diff --git a/pagelayout_editor/pl_editor_frame.cpp b/pagelayout_editor/pl_editor_frame.cpp index 1bd377dd18..dd8e0dd6f7 100644 --- a/pagelayout_editor/pl_editor_frame.cpp +++ b/pagelayout_editor/pl_editor_frame.cpp @@ -454,7 +454,7 @@ void PL_EDITOR_FRAME::UpdateStatusBar() double dXpos = To_User_Unit( g_UserUnit, coord.x*Xsign ); double dYpos = To_User_Unit( g_UserUnit, coord.y*Ysign ); - wxString pagesizeformatter = wxT( "Page size: width %.4g height %.4g" ); + wxString pagesizeformatter = _( "Page size: width %.4g height %.4g" ); wxString absformatter = wxT( "X %.4g Y %.4g" ); wxString locformatter = wxT( "dx %.4g dy %.4g" );