Skip to content

K
kicad-source-mirror
Commit 0b336ede authored by jerryjacobs's avatar jerryjacobs
Browse files
Options

Menu and statusbar strings made more clear

parent dfc80367
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 261 additions and 212 deletions
3d-viewer/3d_toolbar.cpp
View file @ 0b336ede
...@@ -40,16 +40,16 @@ void WinEDA3D_DrawFrame::ReCreateHToolbar() ...@@ -40,16 +40,16 @@ void WinEDA3D_DrawFrame::ReCreateHToolbar()
m_HToolBar->AddSeparator(); m_HToolBar->AddSeparator();
m_HToolBar->AddTool( ID_ZOOM_IN_BUTT, wxEmptyString, BITMAP( zoom_in_xpm ), m_HToolBar->AddTool( ID_ZOOM_IN_BUTT, wxEmptyString, BITMAP( zoom_in_xpm ),
_( "zoom + (F1)" ) ); _( "Zoom in" ) );
m_HToolBar->AddTool( ID_ZOOM_OUT_BUTT, wxEmptyString, BITMAP( zoom_out_xpm ), m_HToolBar->AddTool( ID_ZOOM_OUT_BUTT, wxEmptyString, BITMAP( zoom_out_xpm ),
_( "zoom - (F2)" ) ); _( "Zoom out" ) );
m_HToolBar->AddTool( ID_ZOOM_REDRAW_BUTT, wxEmptyString, BITMAP( zoom_redraw_xpm ), m_HToolBar->AddTool( ID_ZOOM_REDRAW_BUTT, wxEmptyString, BITMAP( zoom_redraw_xpm ),
_( "redraw (F3)" ) ); _( "Redraw view" ) );
m_HToolBar->AddTool( ID_ZOOM_PAGE_BUTT, wxEmptyString, BITMAP( zoom_auto_xpm ), m_HToolBar->AddTool( ID_ZOOM_PAGE_BUTT, wxEmptyString, BITMAP( zoom_auto_xpm ),
_( "auto zoom" ) ); _( "Zoom auto" ) );
m_HToolBar->AddSeparator(); m_HToolBar->AddSeparator();
m_HToolBar->AddTool( ID_ROTATE3D_X_NEG, wxEmptyString, BITMAP( rotate_neg_X_xpm ), m_HToolBar->AddTool( ID_ROTATE3D_X_NEG, wxEmptyString, BITMAP( rotate_neg_X_xpm ),
......
cvpcb/cvframe.cpp
View file @ 0b336ede
...@@ -428,7 +428,7 @@ void WinEDA_CvpcbFrame::AddFontSelectionMenu( wxMenu* main_menu ) ...@@ -428,7 +428,7 @@ void WinEDA_CvpcbFrame::AddFontSelectionMenu( wxMenu* main_menu )
ADD_MENUITEM( fontmenu, ID_PREFERENCES_FONT_STATUS, _( "font for Status Line" ), ADD_MENUITEM( fontmenu, ID_PREFERENCES_FONT_STATUS, _( "font for Status Line" ),
fonts_xpm ); fonts_xpm );
ADD_MENUITEM_WITH_HELP_AND_SUBMENU( main_menu, fontmenu, ADD_MENUITEM_WITH_HELP_AND_SUBMENU( main_menu, fontmenu,
ID_PREFERENCES_FONT, _( "&Font selection" ), ID_PREFERENCES_FONT, _( "&Font" ),
_( _(
"Choose font type and size for dialogs, infos and status box" ), "Choose font type and size for dialogs, infos and status box" ),
fonts_xpm ); fonts_xpm );
......
cvpcb/menucfg.cpp
View file @ 0b336ede
...@@ -199,7 +199,7 @@ wxString FullFileName, ShortLibName, mask; ...@@ -199,7 +199,7 @@ wxString FullFileName, ShortLibName, mask;
Update(); Update();
mask = wxT("*") + LibExtBuffer; mask = wxT("*") + LibExtBuffer;
wxFileDialog FilesDialog(this, _("Library Files:"), g_RealLibDirBuffer, wxFileDialog FilesDialog(this, _("Library files:"), g_RealLibDirBuffer,
wxEmptyString, mask, wxEmptyString, mask,
wxFD_DEFAULT_STYLE | wxFD_MULTIPLE); wxFD_DEFAULT_STYLE | wxFD_MULTIPLE);
......
eeschema/menubar.cpp
View file @ 0b336ede
...@@ -190,7 +190,7 @@ void WinEDA_SchematicFrame::ReCreateMenuBar() ...@@ -190,7 +190,7 @@ void WinEDA_SchematicFrame::ReCreateMenuBar()
viewMenu->AppendSeparator(); viewMenu->AppendSeparator();
msg = AddHotkeyName( _( "redraw" ), s_Schematic_Hokeys_Descr, msg = AddHotkeyName( _( "Redraw view" ), s_Schematic_Hokeys_Descr,
HK_ZOOM_REDRAW ); HK_ZOOM_REDRAW );
item = new wxMenuItem( viewMenu, ID_ZOOM_REDRAW_BUTT, item = new wxMenuItem( viewMenu, ID_ZOOM_REDRAW_BUTT,
msg, _( "Zoom auto" ), msg, _( "Zoom auto" ),
...@@ -355,7 +355,7 @@ void WinEDA_SchematicFrame::ReCreateMenuBar() ...@@ -355,7 +355,7 @@ void WinEDA_SchematicFrame::ReCreateMenuBar()
// Menu Configuration: // Menu Configuration:
wxMenu* configmenu = new wxMenu; wxMenu* configmenu = new wxMenu;
item = new wxMenuItem( configmenu, ID_CONFIG_REQ, item = new wxMenuItem( configmenu, ID_CONFIG_REQ,
_( "&Library settings" ), _( "&Library" ),
_( "Setting Libraries, Directories and others..." ) ); _( "Setting Libraries, Directories and others..." ) );
item->SetBitmap( library_xpm ); item->SetBitmap( library_xpm );
configmenu->Append( item ); configmenu->Append( item );
......
eeschema/tool_lib.cpp
View file @ 0b336ede
...@@ -164,21 +164,21 @@ void WinEDA_LibeditFrame::ReCreateHToolbar() ...@@ -164,21 +164,21 @@ void WinEDA_LibeditFrame::ReCreateHToolbar()
_( "Test duplicate pins" ) ); _( "Test duplicate pins" ) );
m_HToolBar->AddSeparator(); m_HToolBar->AddSeparator();
msg = AddHotkeyName( _( "zoom +" ), s_Libedit_Hokeys_Descr, HK_ZOOM_IN ); msg = AddHotkeyName( _( "Zoom in" ), s_Libedit_Hokeys_Descr, HK_ZOOM_IN );
m_HToolBar->AddTool( ID_ZOOM_IN_BUTT, wxEmptyString, BITMAP( zoom_in_xpm ), m_HToolBar->AddTool( ID_ZOOM_IN_BUTT, wxEmptyString, BITMAP( zoom_in_xpm ),
msg ); msg );
msg = AddHotkeyName( _( "zoom -" ), s_Libedit_Hokeys_Descr, HK_ZOOM_OUT ); msg = AddHotkeyName( _( "Zoom out" ), s_Libedit_Hokeys_Descr, HK_ZOOM_OUT );
m_HToolBar->AddTool( ID_ZOOM_OUT_BUTT, wxEmptyString, BITMAP( zoom_out_xpm ), m_HToolBar->AddTool( ID_ZOOM_OUT_BUTT, wxEmptyString, BITMAP( zoom_out_xpm ),
msg ); msg );
msg = AddHotkeyName( _( "redraw" ), s_Libedit_Hokeys_Descr, HK_ZOOM_REDRAW ); msg = AddHotkeyName( _( "Redraw view" ), s_Libedit_Hokeys_Descr, HK_ZOOM_REDRAW );
m_HToolBar->AddTool( ID_ZOOM_REDRAW_BUTT, wxEmptyString, BITMAP( zoom_redraw_xpm ), m_HToolBar->AddTool( ID_ZOOM_REDRAW_BUTT, wxEmptyString, BITMAP( zoom_redraw_xpm ),
msg ); msg );
m_HToolBar->AddTool( ID_ZOOM_PAGE_BUTT, wxEmptyString, m_HToolBar->AddTool( ID_ZOOM_PAGE_BUTT, wxEmptyString,
BITMAP( zoom_auto_xpm ), BITMAP( zoom_auto_xpm ),
_( "auto zoom" ) ); _( "Zoom auto" ) );
m_HToolBar->AddSeparator(); m_HToolBar->AddSeparator();
m_HToolBar->AddTool( ID_DE_MORGAN_NORMAL_BUTT, wxEmptyString, m_HToolBar->AddTool( ID_DE_MORGAN_NORMAL_BUTT, wxEmptyString,
......
eeschema/tool_sch.cpp
View file @ 0b336ede
...@@ -46,18 +46,18 @@ void WinEDA_SchematicFrame::ReCreateHToolbar() ...@@ -46,18 +46,18 @@ void WinEDA_SchematicFrame::ReCreateHToolbar()
m_HToolBar->AddSeparator(); m_HToolBar->AddSeparator();
m_HToolBar->AddTool( ID_SHEET_SET, wxEmptyString, BITMAP( sheetset_xpm ), m_HToolBar->AddTool( ID_SHEET_SET, wxEmptyString, BITMAP( sheetset_xpm ),
_( "page settings (size, texts)" ) ); _( "Page settings" ) );
m_HToolBar->AddSeparator(); m_HToolBar->AddSeparator();
m_HToolBar->AddTool( ID_TO_LIBRARY, wxEmptyString, BITMAP( libedit_xpm ), m_HToolBar->AddTool( ID_TO_LIBRARY, wxEmptyString, BITMAP( libedit_xpm ),
_( "go to library editor" ) ); _( "Library editor" ) );
m_HToolBar->AddTool( ID_TO_LIBVIEW, wxEmptyString, BITMAP( library_browse_xpm ), m_HToolBar->AddTool( ID_TO_LIBVIEW, wxEmptyString, BITMAP( library_browse_xpm ),
_( "go to library browse" ) ); _( "Library browser" ) );
m_HToolBar->AddSeparator(); m_HToolBar->AddSeparator();
m_HToolBar->AddTool( ID_HIERARCHY, wxEmptyString, BITMAP( hierarchy_nav_xpm ), m_HToolBar->AddTool( ID_HIERARCHY, wxEmptyString, BITMAP( hierarchy_nav_xpm ),
_( "Schematic Hierarchy Navigator" ) ); _( "Schematic hierarchy navigator" ) );
m_HToolBar->AddSeparator(); m_HToolBar->AddSeparator();
...@@ -86,23 +86,23 @@ void WinEDA_SchematicFrame::ReCreateHToolbar() ...@@ -86,23 +86,23 @@ void WinEDA_SchematicFrame::ReCreateHToolbar()
_( "Run Cvpcb" ) ); _( "Run Cvpcb" ) );
m_HToolBar->AddTool( ID_TO_PCB, wxEmptyString, BITMAP( pcbnew_xpm ), m_HToolBar->AddTool( ID_TO_PCB, wxEmptyString, BITMAP( pcbnew_xpm ),
_( "Run Pcbnew" ) ); _( "Run pcbnew" ) );
m_HToolBar->AddSeparator(); m_HToolBar->AddSeparator();
msg = AddHotkeyName( _( "zoom +" ), s_Schematic_Hokeys_Descr, HK_ZOOM_IN ); msg = AddHotkeyName( _( "Zoom in" ), s_Schematic_Hokeys_Descr, HK_ZOOM_IN );
m_HToolBar->AddTool( ID_ZOOM_IN_BUTT, wxEmptyString, BITMAP( zoom_in_xpm ), m_HToolBar->AddTool( ID_ZOOM_IN_BUTT, wxEmptyString, BITMAP( zoom_in_xpm ),
msg ); msg );
msg = AddHotkeyName( _( "zoom -" ), s_Schematic_Hokeys_Descr, HK_ZOOM_OUT ); msg = AddHotkeyName( _( "Zoom out" ), s_Schematic_Hokeys_Descr, HK_ZOOM_OUT );
m_HToolBar->AddTool( ID_ZOOM_OUT_BUTT, wxEmptyString, BITMAP( zoom_out_xpm ), m_HToolBar->AddTool( ID_ZOOM_OUT_BUTT, wxEmptyString, BITMAP( zoom_out_xpm ),
msg ); msg );
msg = AddHotkeyName( _( "redraw" ), s_Schematic_Hokeys_Descr, HK_ZOOM_REDRAW ); msg = AddHotkeyName( _( "Redraw view" ), s_Schematic_Hokeys_Descr, HK_ZOOM_REDRAW );
m_HToolBar->AddTool( ID_ZOOM_REDRAW_BUTT, wxEmptyString, BITMAP( zoom_redraw_xpm ), m_HToolBar->AddTool( ID_ZOOM_REDRAW_BUTT, wxEmptyString, BITMAP( zoom_redraw_xpm ),
msg ); msg );
m_HToolBar->AddTool( ID_ZOOM_PAGE_BUTT, wxEmptyString, BITMAP( zoom_auto_xpm ), m_HToolBar->AddTool( ID_ZOOM_PAGE_BUTT, wxEmptyString, BITMAP( zoom_auto_xpm ),
_( "auto zoom" ) ); _( "Zoom auto" ) );
m_HToolBar->AddSeparator(); m_HToolBar->AddSeparator();
m_HToolBar->AddTool( ID_FIND_ITEMS, wxEmptyString, BITMAP( find_xpm ), m_HToolBar->AddTool( ID_FIND_ITEMS, wxEmptyString, BITMAP( find_xpm ),
......
eeschema/tool_viewlib.cpp
View file @ 0b336ede
...@@ -64,19 +64,19 @@ bool asdeMorgan = FALSE, state; ...@@ -64,19 +64,19 @@ bool asdeMorgan = FALSE, state;
m_HToolBar->AddSeparator(); m_HToolBar->AddSeparator();
m_HToolBar->AddTool(ID_ZOOM_IN_BUTT, wxEmptyString, m_HToolBar->AddTool(ID_ZOOM_IN_BUTT, wxEmptyString,
BITMAP(zoom_in_xpm), BITMAP(zoom_in_xpm),
_("zoom + (F1)")); _("Zoom in"));
m_HToolBar->AddTool(ID_ZOOM_OUT_BUTT, wxEmptyString, m_HToolBar->AddTool(ID_ZOOM_OUT_BUTT, wxEmptyString,
BITMAP(zoom_out_xpm), BITMAP(zoom_out_xpm),
_("zoom - (F2)")); _("Zoom out"));
m_HToolBar->AddTool(ID_ZOOM_REDRAW_BUTT, wxEmptyString, m_HToolBar->AddTool(ID_ZOOM_REDRAW_BUTT, wxEmptyString,
BITMAP(zoom_redraw_xpm), BITMAP(zoom_redraw_xpm),
_("redraw (F3)")); _("Redraw view"));
m_HToolBar->AddTool(ID_ZOOM_PAGE_BUTT, wxEmptyString, m_HToolBar->AddTool(ID_ZOOM_PAGE_BUTT, wxEmptyString,
BITMAP(zoom_auto_xpm), BITMAP(zoom_auto_xpm),
_("best zoom")); _("Best zoom"));
m_HToolBar->AddSeparator(); m_HToolBar->AddSeparator();
m_HToolBar->AddTool(ID_LIBVIEW_DE_MORGAN_NORMAL_BUTT, wxEmptyString, m_HToolBar->AddTool(ID_LIBVIEW_DE_MORGAN_NORMAL_BUTT, wxEmptyString,
......
gerbview/affiche.cpp
View file @ 0b336ede
...@@ -99,9 +99,9 @@ void Affiche_Infos_Piste( WinEDA_BasePcbFrame* frame, TRACK* pt_piste ) ...@@ -99,9 +99,9 @@ void Affiche_Infos_Piste( WinEDA_BasePcbFrame* frame, TRACK* pt_piste )
if( pt_D_code ) if( pt_D_code )
{ {
msg.Printf( wxT( "D%d" ), d_index ); msg.Printf( wxT( "D%d" ), d_index );
Affiche_1_Parametre( frame, 20, _( "D CODE" ), msg, BLUE ); Affiche_1_Parametre( frame, 20, _( "D-code" ), msg, BLUE );
Affiche_1_Parametre( frame, 30, _( "D type" ), Affiche_1_Parametre( frame, 30, _( "D-type" ),
pt_D_code ? g_GERBER_Tool_Type[pt_D_code->m_Shape] : _( "????" ), pt_D_code ? g_GERBER_Tool_Type[pt_D_code->m_Shape] : _( "????" ),
BLUE ); BLUE );
} }
......
gerbview/tool_gerber.cpp
View file @ 0b336ede
...@@ -54,8 +54,8 @@ void WinEDA_GerberFrame::ReCreateMenuBar( void ) ...@@ -54,8 +54,8 @@ void WinEDA_GerberFrame::ReCreateMenuBar( void )
FALSE ); FALSE );
#if 0 #if 0
m_FilesMenu->Append( ID_GERBVIEW_LOAD_DRILL_FILE, m_FilesMenu->Append( ID_GERBVIEW_LOAD_DRILL_FILE,
_( "Load Drill" ), _( "Load drill" ),
_( "Load Drill File (EXCELLON Format)" ), _( "Load excellon drill file" ),
FALSE ); FALSE );
#endif #endif
...@@ -137,11 +137,11 @@ void WinEDA_GerberFrame::ReCreateMenuBar( void ) ...@@ -137,11 +137,11 @@ void WinEDA_GerberFrame::ReCreateMenuBar( void )
wxMenu* miscellaneous_menu = new wxMenu; wxMenu* miscellaneous_menu = new wxMenu;
ADD_MENUITEM_WITH_HELP( miscellaneous_menu, ID_GERBVIEW_SHOW_LIST_DCODES, ADD_MENUITEM_WITH_HELP( miscellaneous_menu, ID_GERBVIEW_SHOW_LIST_DCODES,
_( "&List DCodes" ), _( "&List DCodes" ),
_( "List and Edit DCodes" ), show_dcodenumber_xpm ); _( "List and edit D-codes" ), show_dcodenumber_xpm );
ADD_MENUITEM_WITH_HELP( miscellaneous_menu, ID_GERBVIEW_SHOW_SOURCE, _( "&Show source" ), ADD_MENUITEM_WITH_HELP( miscellaneous_menu, ID_GERBVIEW_SHOW_SOURCE, _( "&Show source" ),
_( "Show source file for the current layer" ), tools_xpm ); _( "Show source file for the current layer" ), tools_xpm );
miscellaneous_menu->AppendSeparator(); miscellaneous_menu->AppendSeparator();
ADD_MENUITEM_WITH_HELP( miscellaneous_menu, ID_PCB_GLOBAL_DELETE, _( "&Delete Layer" ), ADD_MENUITEM_WITH_HELP( miscellaneous_menu, ID_PCB_GLOBAL_DELETE, _( "&Delete layer" ),
_( "Delete current layer" ), general_deletions_xpm ); _( "Delete current layer" ), general_deletions_xpm );
// Menu Help: // Menu Help:
...@@ -268,21 +268,21 @@ void WinEDA_GerberFrame::ReCreateHToolbar( void ) ...@@ -268,21 +268,21 @@ void WinEDA_GerberFrame::ReCreateHToolbar( void )
_( "Print World" ) ); _( "Print World" ) );
m_HToolBar->AddSeparator(); m_HToolBar->AddSeparator();
msg = AddHotkeyName( _( "zoom +" ), s_Gerbview_Hokeys_Descr, HK_ZOOM_IN ); msg = AddHotkeyName( _( "Zoom in" ), s_Gerbview_Hokeys_Descr, HK_ZOOM_IN );
m_HToolBar->AddTool( ID_ZOOM_IN_BUTT, BITMAP( zoom_in_xpm ), m_HToolBar->AddTool( ID_ZOOM_IN_BUTT, BITMAP( zoom_in_xpm ),
wxNullBitmap, wxNullBitmap,
FALSE, FALSE,
-1, -1, (wxObject*) NULL, -1, -1, (wxObject*) NULL,
msg ); msg );
msg = AddHotkeyName( _( "zoom -" ), s_Gerbview_Hokeys_Descr, HK_ZOOM_OUT ); msg = AddHotkeyName( _( "Zoom out" ), s_Gerbview_Hokeys_Descr, HK_ZOOM_OUT );
m_HToolBar->AddTool( ID_ZOOM_OUT_BUTT, BITMAP( zoom_out_xpm ), m_HToolBar->AddTool( ID_ZOOM_OUT_BUTT, BITMAP( zoom_out_xpm ),
wxNullBitmap, wxNullBitmap,
FALSE, FALSE,
-1, -1, (wxObject*) NULL, -1, -1, (wxObject*) NULL,
msg ); msg );
msg = AddHotkeyName( _( "redraw" ), s_Gerbview_Hokeys_Descr, HK_ZOOM_REDRAW ); msg = AddHotkeyName( _( "Redraw view" ), s_Gerbview_Hokeys_Descr, HK_ZOOM_REDRAW );
m_HToolBar->AddTool( ID_ZOOM_REDRAW_BUTT, BITMAP( zoom_redraw_xpm ), m_HToolBar->AddTool( ID_ZOOM_REDRAW_BUTT, BITMAP( zoom_redraw_xpm ),
wxNullBitmap, wxNullBitmap,
FALSE, FALSE,
...@@ -293,14 +293,14 @@ void WinEDA_GerberFrame::ReCreateHToolbar( void ) ...@@ -293,14 +293,14 @@ void WinEDA_GerberFrame::ReCreateHToolbar( void )
wxNullBitmap, wxNullBitmap,
FALSE, FALSE,
-1, -1, (wxObject*) NULL, -1, -1, (wxObject*) NULL,
_( "auto zoom" ) ); _( "Zoom auto" ) );
m_HToolBar->AddSeparator(); m_HToolBar->AddSeparator();
m_HToolBar->AddTool( ID_FIND_ITEMS, BITMAP( find_xpm ), m_HToolBar->AddTool( ID_FIND_ITEMS, BITMAP( find_xpm ),
wxNullBitmap, wxNullBitmap,
FALSE, FALSE,
-1, -1, (wxObject*) NULL, -1, -1, (wxObject*) NULL,
_( "Find D Codes" ) ); _( "Find D-codes" ) );
wxArrayString choices; wxArrayString choices;
m_HToolBar->AddSeparator(); m_HToolBar->AddSeparator();
......
internat/nl/kicad.mo
View file @ 0b336ede
No preview for this file type
internat/nl/kicad.po
View file @ 0b336ede
This diff is collapsed.
pcbnew/dialog_gendrill.cpp
View file @ 0b336ede
...@@ -177,7 +177,7 @@ void WinEDA_DrillFrame::CreateControls() ...@@ -177,7 +177,7 @@ void WinEDA_DrillFrame::CreateControls()
m_Choice_Zeros_Format = new wxRadioBox( itemDialog1, ID_SEL_ZEROS_FMT, _("Zeros Format"), wxDefaultPosition, wxDefaultSize, m_Choice_Zeros_FormatStrings, 1, wxRA_SPECIFY_COLS ); m_Choice_Zeros_Format = new wxRadioBox( itemDialog1, ID_SEL_ZEROS_FMT, _("Zeros Format"), wxDefaultPosition, wxDefaultSize, m_Choice_Zeros_FormatStrings, 1, wxRA_SPECIFY_COLS );
m_Choice_Zeros_Format->SetSelection(0); m_Choice_Zeros_Format->SetSelection(0);
if (WinEDA_DrillFrame::ShowToolTips()) if (WinEDA_DrillFrame::ShowToolTips())
m_Choice_Zeros_Format->SetToolTip(_("Choose EXCELLON numbers notation")); m_Choice_Zeros_Format->SetToolTip(_("Choose excellon numbers notation"));
m_LeftBoxSizer->Add(m_Choice_Zeros_Format, 0, wxALIGN_LEFT|wxALL, 5); m_LeftBoxSizer->Add(m_Choice_Zeros_Format, 0, wxALIGN_LEFT|wxALL, 5);
wxArrayString m_Choice_PrecisionStrings; wxArrayString m_Choice_PrecisionStrings;
...@@ -186,7 +186,7 @@ void WinEDA_DrillFrame::CreateControls() ...@@ -186,7 +186,7 @@ void WinEDA_DrillFrame::CreateControls()
m_Choice_Precision = new wxRadioBox( itemDialog1, ID_SEL_PRECISION, _("Precision"), wxDefaultPosition, wxDefaultSize, m_Choice_PrecisionStrings, 1, wxRA_SPECIFY_COLS ); m_Choice_Precision = new wxRadioBox( itemDialog1, ID_SEL_PRECISION, _("Precision"), wxDefaultPosition, wxDefaultSize, m_Choice_PrecisionStrings, 1, wxRA_SPECIFY_COLS );
m_Choice_Precision->SetSelection(0); m_Choice_Precision->SetSelection(0);
if (WinEDA_DrillFrame::ShowToolTips()) if (WinEDA_DrillFrame::ShowToolTips())
m_Choice_Precision->SetToolTip(_("Choose EXCELLON numbers precision")); m_Choice_Precision->SetToolTip(_("Choose excellon numbers precision"));
m_LeftBoxSizer->Add(m_Choice_Precision, 0, wxGROW|wxALL, 5); m_LeftBoxSizer->Add(m_Choice_Precision, 0, wxGROW|wxALL, 5);
wxArrayString m_Choice_Drill_OffsetStrings; wxArrayString m_Choice_Drill_OffsetStrings;
...@@ -247,7 +247,7 @@ void WinEDA_DrillFrame::CreateControls() ...@@ -247,7 +247,7 @@ void WinEDA_DrillFrame::CreateControls()
m_Check_Minimal = new wxCheckBox( itemDialog1, ID_CHECKBOX3, _("minimal header"), wxDefaultPosition, wxDefaultSize, 0 ); m_Check_Minimal = new wxCheckBox( itemDialog1, ID_CHECKBOX3, _("minimal header"), wxDefaultPosition, wxDefaultSize, 0 );
m_Check_Minimal->SetValue(false); m_Check_Minimal->SetValue(false);
if (WinEDA_DrillFrame::ShowToolTips()) if (WinEDA_DrillFrame::ShowToolTips())
m_Check_Minimal->SetToolTip(_("If checked, the EXCELLON header is minimal")); m_Check_Minimal->SetToolTip(_("If checked, the excellon header is minimal"));
itemStaticBoxSizer16->Add(m_Check_Minimal, 0, wxGROW|wxALL, 5); itemStaticBoxSizer16->Add(m_Check_Minimal, 0, wxGROW|wxALL, 5);
wxBoxSizer* itemBoxSizer19 = new wxBoxSizer(wxVERTICAL); wxBoxSizer* itemBoxSizer19 = new wxBoxSizer(wxVERTICAL);
......
pcbnew/dialog_setup_libs.cpp
View file @ 0b336ede
...@@ -364,7 +364,7 @@ wxString mask = wxT("*"); ...@@ -364,7 +364,7 @@ wxString mask = wxT("*");
mask += LibExtBuffer; mask += LibExtBuffer;
g_RealLibDirBuffer.Replace( wxT("\\"), wxT("/")); g_RealLibDirBuffer.Replace( wxT("\\"), wxT("/"));
wxFileDialog FilesDialog(this, _("Library Files:"), g_RealLibDirBuffer, wxFileDialog FilesDialog(this, _("Library files:"), g_RealLibDirBuffer,
wxEmptyString, mask, wxEmptyString, mask,
wxFD_DEFAULT_STYLE | wxFD_MULTIPLE); wxFD_DEFAULT_STYLE | wxFD_MULTIPLE);
......
pcbnew/loadcmp.cpp
View file @ 0b336ede
...@@ -226,7 +226,7 @@ MODULE* WinEDA_BasePcbFrame::Get_Librairie_Module( wxWindow* winaff, ...@@ -226,7 +226,7 @@ MODULE* WinEDA_BasePcbFrame::Get_Librairie_Module( wxWindow* winaff,
StrPurge( Line ); StrPurge( Line );
if( strnicmp( Line, ENTETE_LIBRAIRIE, L_ENTETE_LIB ) != 0 ) if( strnicmp( Line, ENTETE_LIBRAIRIE, L_ENTETE_LIB ) != 0 )
{ {
DisplayError( winaff, _( "File is Not a library" ) ); DisplayError( winaff, _( "File is not a library" ) );
return NULL; return NULL;
} }
......
pcbnew/menubarpcb.cpp
View file @ 0b336ede
...@@ -35,7 +35,7 @@ void WinEDA_PcbFrame::ReCreateMenuBar() ...@@ -35,7 +35,7 @@ void WinEDA_PcbFrame::ReCreateMenuBar()
////////////////// //////////////////
m_FilesMenu = new wxMenu; m_FilesMenu = new wxMenu;
wxMenuItem *item = new wxMenuItem(m_FilesMenu, ID_MENU_LOAD_FILE, wxMenuItem *item = new wxMenuItem(m_FilesMenu, ID_MENU_LOAD_FILE,
_("Load Board Ctrl-O"), _("Load board Ctrl-O"),
_("Delete old Board and Load new Board")); _("Delete old Board and Load new Board"));
item->SetBitmap(open_xpm); item->SetBitmap(open_xpm);
m_FilesMenu->Append(item); m_FilesMenu->Append(item);
...@@ -73,7 +73,7 @@ void WinEDA_PcbFrame::ReCreateMenuBar() ...@@ -73,7 +73,7 @@ void WinEDA_PcbFrame::ReCreateMenuBar()
m_FilesMenu->Append(item); m_FilesMenu->Append(item);
item = new wxMenuItem(m_FilesMenu, ID_MENU_SAVE_BOARD_AS, item = new wxMenuItem(m_FilesMenu, ID_MENU_SAVE_BOARD_AS,
_("Save Board as.."), _("Save board as.."),
_("Save current board as..") ); _("Save current board as..") );
item->SetBitmap(save_as_xpm); item->SetBitmap(save_as_xpm);
m_FilesMenu->Append(item); m_FilesMenu->Append(item);
...@@ -171,7 +171,7 @@ void WinEDA_PcbFrame::ReCreateMenuBar() ...@@ -171,7 +171,7 @@ void WinEDA_PcbFrame::ReCreateMenuBar()
// Configuration et preferences: // // Configuration et preferences: //
/////////////////////////////////// ///////////////////////////////////
wxMenu * configmenu = new wxMenu; wxMenu * configmenu = new wxMenu;
item = new wxMenuItem(configmenu, ID_CONFIG_REQ, _("&Library settings"), item = new wxMenuItem(configmenu, ID_CONFIG_REQ, _("&Library"),
_("Setting Libraries, Directories and others...")); _("Setting Libraries, Directories and others..."));
item->SetBitmap(library_xpm); item->SetBitmap(library_xpm);
configmenu->Append(item); configmenu->Append(item);
...@@ -181,12 +181,12 @@ void WinEDA_PcbFrame::ReCreateMenuBar() ...@@ -181,12 +181,12 @@ void WinEDA_PcbFrame::ReCreateMenuBar()
item->SetBitmap(palette_xpm); item->SetBitmap(palette_xpm);
configmenu->Append(item); configmenu->Append(item);
item = new wxMenuItem(configmenu, ID_OPTIONS_SETUP, _("&General Options"), item = new wxMenuItem(configmenu, ID_OPTIONS_SETUP, _("&General"),
_("Select general options for pcbnew")); _("Select general options for pcbnew"));
item->SetBitmap(preference_xpm); item->SetBitmap(preference_xpm);
configmenu->Append(item); configmenu->Append(item);
item = new wxMenuItem(configmenu, ID_PCB_LOOK_SETUP, _("&Display Options"), item = new wxMenuItem(configmenu, ID_PCB_LOOK_SETUP, _("&Display"),
_("Select what items are displayed")); _("Select what items are displayed"));
item->SetBitmap(display_options_xpm); item->SetBitmap(display_options_xpm);
configmenu->Append(item); configmenu->Append(item);
...@@ -220,17 +220,17 @@ void WinEDA_PcbFrame::ReCreateMenuBar() ...@@ -220,17 +220,17 @@ void WinEDA_PcbFrame::ReCreateMenuBar()
item->SetBitmap(showtrack_xpm); item->SetBitmap(showtrack_xpm);
sizes_menu->Append(item); sizes_menu->Append(item);
item = new wxMenuItem(sizes_menu, ID_PCB_USER_GRID_SETUP, _("User Grid Size"), item = new wxMenuItem(sizes_menu, ID_PCB_USER_GRID_SETUP, _("Grid"),
_("Adjust User Grid")); _("Adjust User Grid"));
item->SetBitmap(grid_xpm); item->SetBitmap(grid_xpm);
sizes_menu->Append(item); sizes_menu->Append(item);
item = new wxMenuItem(sizes_menu, ID_PCB_DRAWINGS_WIDTHS_SETUP, _("Texts and Drawings"), item = new wxMenuItem(sizes_menu, ID_PCB_DRAWINGS_WIDTHS_SETUP, _("Texts and drawings"),
_("Adjust width for texts and drawings")); _("Adjust width for texts and drawings"));
item->SetBitmap(options_text_xpm); item->SetBitmap(options_text_xpm);
sizes_menu->Append(item); sizes_menu->Append(item);
item = new wxMenuItem(sizes_menu, ID_PCB_PAD_SETUP, _("Pad Settings"), item = new wxMenuItem(sizes_menu, ID_PCB_PAD_SETUP, _("Pads"),
_("Adjust size,shape,layers... for Pads")); _("Adjust size,shape,layers... for Pads"));
item->SetBitmap(pad_xpm); item->SetBitmap(pad_xpm);
sizes_menu->Append(item); sizes_menu->Append(item);
...@@ -252,7 +252,7 @@ void WinEDA_PcbFrame::ReCreateMenuBar() ...@@ -252,7 +252,7 @@ void WinEDA_PcbFrame::ReCreateMenuBar()
postprocess_menu->Append(item); postprocess_menu->Append(item);
item = new wxMenuItem(postprocess_menu, ID_PCB_GEN_DRILL_FILE, _("Create &drill file"), item = new wxMenuItem(postprocess_menu, ID_PCB_GEN_DRILL_FILE, _("Create &drill file"),
_("Generate drill file (Excellion)")); _("Generate excellon drill file"));
item->SetBitmap(post_drill_xpm); item->SetBitmap(post_drill_xpm);
postprocess_menu->Append(item); postprocess_menu->Append(item);
......
pcbnew/onrightclick.cpp
View file @ 0b336ede
...@@ -124,7 +124,7 @@ bool WinEDA_PcbFrame::OnRightClick( const wxPoint& aMousePos, wxMenu* aPopMenu ) ...@@ -124,7 +124,7 @@ bool WinEDA_PcbFrame::OnRightClick( const wxPoint& aMousePos, wxMenu* aPopMenu )
else else
{ {
ADD_MENUITEM( aPopMenu, ID_POPUP_CLOSE_CURRENT_TOOL, ADD_MENUITEM( aPopMenu, ID_POPUP_CLOSE_CURRENT_TOOL,
_( "End Tool" ), cancel_tool_xpm ); _( "End tool" ), cancel_tool_xpm );
} }
aPopMenu->AppendSeparator(); aPopMenu->AppendSeparator();
} }
...@@ -591,7 +591,7 @@ void WinEDA_PcbFrame::createPopupMenuForTracks( TRACK* Track, wxMenu* PopMenu ) ...@@ -591,7 +591,7 @@ void WinEDA_PcbFrame::createPopupMenuForTracks( TRACK* Track, wxMenu* PopMenu )
ADD_MENUITEM( track_mnu, ID_POPUP_PCB_DELETE_TRACK, ADD_MENUITEM( track_mnu, ID_POPUP_PCB_DELETE_TRACK,
msg, delete_track_xpm ); msg, delete_track_xpm );
ADD_MENUITEM( track_mnu, ID_POPUP_PCB_DELETE_TRACKNET, ADD_MENUITEM( track_mnu, ID_POPUP_PCB_DELETE_TRACKNET,
_( "Delete Net" ), delete_net_xpm ); _( "Delete net" ), delete_net_xpm );
} }
track_mnu = new wxMenu; track_mnu = new wxMenu;
......
pcbnew/tool_modedit.cpp
View file @ 0b336ede
...@@ -103,20 +103,20 @@ void WinEDA_ModuleEditFrame::ReCreateHToolbar() ...@@ -103,20 +103,20 @@ void WinEDA_ModuleEditFrame::ReCreateHToolbar()
_( "Print Module" ) ); _( "Print Module" ) );
m_HToolBar->AddSeparator(); m_HToolBar->AddSeparator();
msg = AddHotkeyName( _( "zoom +" ), s_Module_Editor_Hokeys_Descr, HK_ZOOM_IN ); msg = AddHotkeyName( _( "Zoom in" ), s_Module_Editor_Hokeys_Descr, HK_ZOOM_IN );
m_HToolBar->AddTool( ID_ZOOM_IN_BUTT, wxEmptyString, BITMAP( zoom_in_xpm ), m_HToolBar->AddTool( ID_ZOOM_IN_BUTT, wxEmptyString, BITMAP( zoom_in_xpm ),
msg ); msg );
msg = AddHotkeyName( _( "zoom -" ), s_Module_Editor_Hokeys_Descr, HK_ZOOM_OUT ); msg = AddHotkeyName( _( "Zoom out" ), s_Module_Editor_Hokeys_Descr, HK_ZOOM_OUT );
m_HToolBar->AddTool( ID_ZOOM_OUT_BUTT, wxEmptyString, BITMAP( zoom_out_xpm ), m_HToolBar->AddTool( ID_ZOOM_OUT_BUTT, wxEmptyString, BITMAP( zoom_out_xpm ),
msg ); msg );
msg = AddHotkeyName( _( "redraw" ), s_Module_Editor_Hokeys_Descr, HK_ZOOM_REDRAW ); msg = AddHotkeyName( _( "Redraw view" ), s_Module_Editor_Hokeys_Descr, HK_ZOOM_REDRAW );
m_HToolBar->AddTool( ID_ZOOM_REDRAW_BUTT, wxEmptyString, BITMAP( zoom_redraw_xpm ), m_HToolBar->AddTool( ID_ZOOM_REDRAW_BUTT, wxEmptyString, BITMAP( zoom_redraw_xpm ),
msg ); msg );
m_HToolBar->AddTool( ID_ZOOM_PAGE_BUTT, wxEmptyString, BITMAP( zoom_auto_xpm ), m_HToolBar->AddTool( ID_ZOOM_PAGE_BUTT, wxEmptyString, BITMAP( zoom_auto_xpm ),
_( "auto zoom" ) ); _( "Zoom auto" ) );
m_HToolBar->AddSeparator(); m_HToolBar->AddSeparator();
m_HToolBar->AddTool( ID_MODEDIT_PAD_SETTINGS, wxEmptyString, m_HToolBar->AddTool( ID_MODEDIT_PAD_SETTINGS, wxEmptyString,
......
pcbnew/tool_pcb.cpp
View file @ 0b336ede
...@@ -221,18 +221,18 @@ void WinEDA_PcbFrame::ReCreateHToolbar() ...@@ -221,18 +221,18 @@ void WinEDA_PcbFrame::ReCreateHToolbar()
SetToolBar( m_HToolBar ); SetToolBar( m_HToolBar );
// Set up toolbar // Set up toolbar
m_HToolBar->AddTool( ID_NEW_BOARD, wxEmptyString, BITMAP( new_xpm ), _( "New Board" ) ); m_HToolBar->AddTool( ID_NEW_BOARD, wxEmptyString, BITMAP( new_xpm ), _( "New board" ) );
m_HToolBar->AddTool( ID_LOAD_FILE, wxEmptyString, BITMAP( open_xpm ), m_HToolBar->AddTool( ID_LOAD_FILE, wxEmptyString, BITMAP( open_xpm ),
_( "Open existing Board" ) ); _( "Open existing board" ) );
m_HToolBar->AddTool( ID_SAVE_BOARD, wxEmptyString, BITMAP( save_xpm ), _( "Save Board" ) ); m_HToolBar->AddTool( ID_SAVE_BOARD, wxEmptyString, BITMAP( save_xpm ), _( "Save board" ) );
m_HToolBar->AddSeparator(); m_HToolBar->AddSeparator();
m_HToolBar->AddTool( ID_SHEET_SET, wxEmptyString, BITMAP( sheetset_xpm ), m_HToolBar->AddTool( ID_SHEET_SET, wxEmptyString, BITMAP( sheetset_xpm ),
_( "page settings (size, texts)" ) ); _( "Page settings (size, texts)" ) );
m_HToolBar->AddSeparator(); m_HToolBar->AddSeparator();
m_HToolBar->AddTool( ID_OPEN_MODULE_EDITOR, wxEmptyString, BITMAP( modedit_xpm ), m_HToolBar->AddTool( ID_OPEN_MODULE_EDITOR, wxEmptyString, BITMAP( modedit_xpm ),
_( "Open Module Editor" ) ); _( "Open module editor" ) );
m_HToolBar->AddSeparator(); m_HToolBar->AddSeparator();
m_HToolBar->AddTool( wxID_CUT, wxEmptyString, BITMAP( cut_button ), _( "Cut selected item" ) ); m_HToolBar->AddTool( wxID_CUT, wxEmptyString, BITMAP( cut_button ), _( "Cut selected item" ) );
...@@ -247,25 +247,25 @@ void WinEDA_PcbFrame::ReCreateHToolbar() ...@@ -247,25 +247,25 @@ void WinEDA_PcbFrame::ReCreateHToolbar()
m_HToolBar->AddTool( ID_UNDO_BUTT, wxEmptyString, BITMAP( undelete_xpm ), _( "Undelete" ) ); m_HToolBar->AddTool( ID_UNDO_BUTT, wxEmptyString, BITMAP( undelete_xpm ), _( "Undelete" ) );
m_HToolBar->AddSeparator(); m_HToolBar->AddSeparator();
m_HToolBar->AddTool( ID_GEN_PRINT, wxEmptyString, BITMAP( print_button ), _( "Print Board" ) ); m_HToolBar->AddTool( ID_GEN_PRINT, wxEmptyString, BITMAP( print_button ), _( "Print board" ) );
m_HToolBar->AddTool( ID_GEN_PLOT, wxEmptyString, BITMAP( plot_xpm ), m_HToolBar->AddTool( ID_GEN_PLOT, wxEmptyString, BITMAP( plot_xpm ),
_( "Plot (HPGL, PostScript, or GERBER format)" ) ); _( "Plot (HPGL, PostScript, or GERBER format)" ) );
m_HToolBar->AddSeparator(); m_HToolBar->AddSeparator();
msg = AddHotkeyName( _( "zoom +" ), s_Board_Editor_Hokeys_Descr, HK_ZOOM_IN ); msg = AddHotkeyName( _( "Zoom in" ), s_Board_Editor_Hokeys_Descr, HK_ZOOM_IN );
m_HToolBar->AddTool( ID_ZOOM_IN_BUTT, wxEmptyString, BITMAP( zoom_in_xpm ), m_HToolBar->AddTool( ID_ZOOM_IN_BUTT, wxEmptyString, BITMAP( zoom_in_xpm ),
msg ); msg );
msg = AddHotkeyName( _( "zoom -" ), s_Board_Editor_Hokeys_Descr, HK_ZOOM_OUT ); msg = AddHotkeyName( _( "Zoom out" ), s_Board_Editor_Hokeys_Descr, HK_ZOOM_OUT );
m_HToolBar->AddTool( ID_ZOOM_OUT_BUTT, wxEmptyString, BITMAP( zoom_out_xpm ), m_HToolBar->AddTool( ID_ZOOM_OUT_BUTT, wxEmptyString, BITMAP( zoom_out_xpm ),
msg ); msg );
msg = AddHotkeyName( _( "redraw" ), s_Board_Editor_Hokeys_Descr, HK_ZOOM_REDRAW ); msg = AddHotkeyName( _( "Redraw view" ), s_Board_Editor_Hokeys_Descr, HK_ZOOM_REDRAW );
m_HToolBar->AddTool( ID_ZOOM_REDRAW_BUTT, wxEmptyString, BITMAP( zoom_redraw_xpm ), m_HToolBar->AddTool( ID_ZOOM_REDRAW_BUTT, wxEmptyString, BITMAP( zoom_redraw_xpm ),
msg ); msg );
m_HToolBar->AddTool( ID_ZOOM_PAGE_BUTT, wxEmptyString, BITMAP( zoom_auto_xpm ), m_HToolBar->AddTool( ID_ZOOM_PAGE_BUTT, wxEmptyString, BITMAP( zoom_auto_xpm ),
_( "auto zoom" ) ); _( "Zoom auto" ) );
m_HToolBar->AddSeparator(); m_HToolBar->AddSeparator();
msg = AddHotkeyName( _( msg = AddHotkeyName( _(
...@@ -276,7 +276,7 @@ void WinEDA_PcbFrame::ReCreateHToolbar() ...@@ -276,7 +276,7 @@ void WinEDA_PcbFrame::ReCreateHToolbar()
m_HToolBar->AddSeparator(); m_HToolBar->AddSeparator();
m_HToolBar->AddTool( ID_GET_NETLIST, wxEmptyString, BITMAP( netlist_xpm ), m_HToolBar->AddTool( ID_GET_NETLIST, wxEmptyString, BITMAP( netlist_xpm ),
_( "Read Netlist" ) ); _( "Read netlist" ) );
m_HToolBar->AddTool( ID_DRC_CONTROL, wxEmptyString, BITMAP( erc_xpm ), m_HToolBar->AddTool( ID_DRC_CONTROL, wxEmptyString, BITMAP( erc_xpm ),
_( "Pcb Design Rules Check" ) ); _( "Pcb Design Rules Check" ) );
......
share/drawframe.cpp
View file @ 0b336ede
...@@ -138,7 +138,7 @@ void WinEDA_DrawFrame::AddFontSelectionMenu( wxMenu* main_menu ) ...@@ -138,7 +138,7 @@ void WinEDA_DrawFrame::AddFontSelectionMenu( wxMenu* main_menu )
ADD_MENUITEM( fontmenu, ID_PREFERENCES_FONT_STATUS, _( "font for Status Line" ), ADD_MENUITEM( fontmenu, ID_PREFERENCES_FONT_STATUS, _( "font for Status Line" ),
fonts_xpm ); fonts_xpm );
ADD_MENUITEM_WITH_HELP_AND_SUBMENU( main_menu, fontmenu, ADD_MENUITEM_WITH_HELP_AND_SUBMENU( main_menu, fontmenu,
ID_PREFERENCES_FONT, _("&Font selection"), ID_PREFERENCES_FONT, _("&Font"),
_("Choose font type and size for dialogs, infos and status box"), _("Choose font type and size for dialogs, infos and status box"),
fonts_xpm ); fonts_xpm );
} }
......
share/zoom.cpp
View file @ 0b336ede
...@@ -360,13 +360,13 @@ void WinEDA_DrawPanel::AddMenuZoom( wxMenu* MasterMenu ) ...@@ -360,13 +360,13 @@ void WinEDA_DrawPanel::AddMenuZoom( wxMenu* MasterMenu )
ADD_MENUITEM( MasterMenu, ID_POPUP_ZOOM_CENTER, _( "Center" ), zoom_center_xpm ); ADD_MENUITEM( MasterMenu, ID_POPUP_ZOOM_CENTER, _( "Center" ), zoom_center_xpm );
ADD_MENUITEM( MasterMenu, ID_POPUP_ZOOM_IN, _( "Zoom in" ), zoom_in_xpm ); ADD_MENUITEM( MasterMenu, ID_POPUP_ZOOM_IN, _( "Zoom in" ), zoom_in_xpm );
ADD_MENUITEM( MasterMenu, ID_POPUP_ZOOM_OUT, _( "Zoom out" ), zoom_out_xpm ); ADD_MENUITEM( MasterMenu, ID_POPUP_ZOOM_OUT, _( "Zoom out" ), zoom_out_xpm );
ADD_MENUITEM( MasterMenu, ID_POPUP_ZOOM_AUTO, _( "Zoom auto" ), zoom_auto_xpm );
wxMenu* zoom_choice = new wxMenu; wxMenu* zoom_choice = new wxMenu;
ADD_MENUITEM_WITH_SUBMENU( MasterMenu, zoom_choice, ADD_MENUITEM_WITH_SUBMENU( MasterMenu, zoom_choice,
ID_POPUP_ZOOM_SELECT, _( "Zoom Select" ), zoom_select_xpm ); ID_POPUP_ZOOM_SELECT, _( "Zoom select" ), zoom_select_xpm );
ADD_MENUITEM( MasterMenu, ID_POPUP_ZOOM_AUTO, _( "Auto" ), zoom_auto_xpm ); ADD_MENUITEM( MasterMenu, ID_POPUP_ZOOM_REDRAW, _( "Redraw view" ), zoom_redraw_xpm );
ADD_MENUITEM( MasterMenu, ID_POPUP_ZOOM_REDRAW, _( "Redraw" ), zoom_redraw_xpm );
/* Create the basic zoom list: */ /* Create the basic zoom list: */
zoom = GetScreen()->GetZoom(); zoom = GetScreen()->GetZoom();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment