Commit e9c7d50c authored by charras's avatar charras

fixed some typo, misspelling and errors in menus.

parent b8e27b50
...@@ -367,7 +367,7 @@ int WinEDA_BasicFrame::WriteHotkeyConfigFile( const wxString& ...@@ -367,7 +367,7 @@ int WinEDA_BasicFrame::WriteHotkeyConfigFile( const wxString&
Ext = DEFAULT_HOTKEY_FILENAME_EXT; Ext = DEFAULT_HOTKEY_FILENAME_EXT;
Mask = wxT( "*" ) + Ext; Mask = wxT( "*" ) + Ext;
Path = ReturnHotkeyConfigFilePath( g_ConfigFileLocationChoice ); Path = ReturnHotkeyConfigFilePath( g_ConfigFileLocationChoice );
FullFilename = EDA_FileSelector( _( "Hotkey configuration file:" ), FullFilename = EDA_FileSelector( _( "Save Hotkey Configuration File:" ),
Path, /* Chemin par defaut */ Path, /* Chemin par defaut */
FullFilename, /* nom fichier par defaut */ FullFilename, /* nom fichier par defaut */
Ext, /* extension par defaut */ Ext, /* extension par defaut */
...@@ -485,7 +485,7 @@ int WinEDA_BasicFrame::ReadHotkeyConfigFile( const wxString& ...@@ -485,7 +485,7 @@ int WinEDA_BasicFrame::ReadHotkeyConfigFile( const wxString&
Ext = DEFAULT_HOTKEY_FILENAME_EXT; Ext = DEFAULT_HOTKEY_FILENAME_EXT;
Mask = wxT( "*" ) + Ext; Mask = wxT( "*" ) + Ext;
Path = ReturnHotkeyConfigFilePath( g_ConfigFileLocationChoice ); Path = ReturnHotkeyConfigFilePath( g_ConfigFileLocationChoice );
FullFilename = EDA_FileSelector( _( "Hotkey configuration file:" ), FullFilename = EDA_FileSelector( _( "Open Hotkey Configuration File:" ),
Path, /* Chemin par defaut */ Path, /* Chemin par defaut */
FullFilename, /* nom fichier par defaut */ FullFilename, /* nom fichier par defaut */
Ext, /* extension par defaut */ Ext, /* extension par defaut */
......
...@@ -53,7 +53,7 @@ char Line[1024]; ...@@ -53,7 +53,7 @@ char Line[1024];
FILE *fichierstf ; /* sert en lecture des differents fichiers *.STF */ FILE *fichierstf ; /* sert en lecture des differents fichiers *.STF */
AUTOMODULE * ItemModule,* NextMod; AUTOMODULE * ItemModule,* NextMod;
AUTOMODULE * BaseListeMod = NULL; AUTOMODULE * BaseListeMod = NULL;
STORECMP * Componant; STORECMP * Component;
int nb_correspondances = 0; int nb_correspondances = 0;
...@@ -110,12 +110,12 @@ int nb_correspondances = 0; ...@@ -110,12 +110,12 @@ int nb_correspondances = 0;
frame->SetStatusText(msg, 0); frame->SetStatusText(msg, 0);
} }
Componant = g_BaseListeCmp; Component = g_BaseListeCmp;
for ( ii = 0; Componant != NULL; Componant = Componant->Pnext, ii++ ) for ( ii = 0; Component != NULL; Component = Component->Pnext, ii++ )
{ {
frame->m_ListCmp->SetSelection(ii,TRUE); frame->m_ListCmp->SetSelection(ii,TRUE);
if( Componant->m_Module.IsEmpty() ) if( Component->m_Module.IsEmpty() )
auto_select(frame, Componant, BaseListeMod); auto_select(frame, Component, BaseListeMod);
} }
/* Liberation memoire */ /* Liberation memoire */
......
...@@ -256,7 +256,7 @@ void WinEDA_CvpcbFrame::OnCloseWindow( wxCloseEvent& Event ) ...@@ -256,7 +256,7 @@ void WinEDA_CvpcbFrame::OnCloseWindow( wxCloseEvent& Event )
} }
FreeMemoryModules(); FreeMemoryModules();
FreeMemoryComponants(); FreeMemoryComponents();
modified = 0; modified = 0;
SaveSettings(); SaveSettings();
...@@ -376,7 +376,7 @@ void WinEDA_CvpcbFrame::DelAssociations( wxCommandEvent& event ) ...@@ -376,7 +376,7 @@ void WinEDA_CvpcbFrame::DelAssociations( wxCommandEvent& event )
composants_non_affectes = nbcomp; composants_non_affectes = nbcomp;
} }
Line.Printf( _( "Componants: %d (free: %d)" ), nbcomp, Line.Printf( _( "Components: %d (free: %d)" ), nbcomp,
composants_non_affectes ); composants_non_affectes );
SetStatusText( Line, 1 ); SetStatusText( Line, 1 );
} }
......
...@@ -125,7 +125,7 @@ void WinEDA_CvpcbFrame::ReadNetListe() ...@@ -125,7 +125,7 @@ void WinEDA_CvpcbFrame::ReadNetListe()
if( g_BaseListeCmp ) if( g_BaseListeCmp )
m_ListCmp->SetSelection( 0, TRUE ); m_ListCmp->SetSelection( 0, TRUE );
msg.Printf( _( "Componants: %d (free: %d)" ), nbcomp, msg.Printf( _( "Components: %d (free: %d)" ), nbcomp,
composants_non_affectes ); composants_non_affectes );
SetStatusText( msg, 1 ); SetStatusText( msg, 1 );
......
...@@ -34,7 +34,7 @@ STOREMOD * Module, * NextMod; ...@@ -34,7 +34,7 @@ STOREMOD * Module, * NextMod;
} }
/***********************************/ /***********************************/
void FreeMemoryComponants() void FreeMemoryComponents()
/***********************************/ /***********************************/
/* Routine de liberation memoire de la liste des composants /* Routine de liberation memoire de la liste des composants
......
...@@ -21,7 +21,7 @@ void Read_Config( const wxString & FullFileName ); /* lit la configuration */ ...@@ -21,7 +21,7 @@ void Read_Config( const wxString & FullFileName ); /* lit la configuration */
/***************/ /***************/
/* MEMOIRE.CPP */ /* MEMOIRE.CPP */
/***************/ /***************/
void FreeMemoryComponants(); void FreeMemoryComponents();
/* Routine de liberation memoire de la liste des composants /* Routine de liberation memoire de la liste des composants
- remet a NULL BaseListeMod - remet a NULL BaseListeMod
- remet a 0 NbComp */ - remet a 0 NbComp */
......
...@@ -103,7 +103,7 @@ int WinEDA_CvpcbFrame::ReadSchematicNetlist() ...@@ -103,7 +103,7 @@ int WinEDA_CvpcbFrame::ReadSchematicNetlist()
/* Clear components buffer */ /* Clear components buffer */
if( g_BaseListeCmp ) if( g_BaseListeCmp )
FreeMemoryComponants(); FreeMemoryComponents();
source = wxFopen( FFileName, wxT( "rt" ) ); source = wxFopen( FFileName, wxT( "rt" ) );
if( source == 0 ) if( source == 0 )
......
...@@ -68,7 +68,7 @@ DIALOG_SVG_PRINT_base::DIALOG_SVG_PRINT_base( wxWindow* parent, wxWindowID id, c ...@@ -68,7 +68,7 @@ DIALOG_SVG_PRINT_base::DIALOG_SVG_PRINT_base( wxWindow* parent, wxWindowID id, c
bMainSizer->Add( m_staticText1, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); bMainSizer->Add( m_staticText1, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
m_FileNameCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_FileNameCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
m_FileNameCtrl->SetToolTip( _("Enter a filename if you do not want to use defaults files names\nCan be used only when printing the current sheet") ); m_FileNameCtrl->SetToolTip( _("Enter a filename if you do not want to use default file names\nCan be used only when printing the current sheet") );
m_FileNameCtrl->SetMinSize( wxSize( 450,-1 ) ); m_FileNameCtrl->SetMinSize( wxSize( 450,-1 ) );
bMainSizer->Add( m_FileNameCtrl, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); bMainSizer->Add( m_FileNameCtrl, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
......
...@@ -551,7 +551,7 @@ ...@@ -551,7 +551,7 @@
<property name="size"></property> <property name="size"></property>
<property name="style"></property> <property name="style"></property>
<property name="subclass"></property> <property name="subclass"></property>
<property name="tooltip">Enter a filename if you do not want to use defaults files names&#x0A;Can be used only when printing the current sheet</property> <property name="tooltip">Enter a filename if you do not want to use default file names&#x0A;Can be used only when printing the current sheet</property>
<property name="value"></property> <property name="value"></property>
<property name="window_extra_style"></property> <property name="window_extra_style"></property>
<property name="window_name"></property> <property name="window_name"></property>
......
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Aug 7 2008) // C++ code generated with wxFormBuilder (version Apr 16 2008)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO "NOT" EDIT THIS FILE! // PLEASE DO "NOT" EDIT THIS FILE!
...@@ -71,6 +71,7 @@ DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP( ...@@ -71,6 +71,7 @@ DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP(
optionsSizer->Add( chipnameSizer, 0, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 8 ); optionsSizer->Add( chipnameSizer, 0, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 8 );
convertCheckBox = new wxCheckBox( this, wxID_ANY, _("Convert"), wxDefaultPosition, wxDefaultSize, 0 ); convertCheckBox = new wxCheckBox( this, wxID_ANY, _("Convert"), wxDefaultPosition, wxDefaultSize, 0 );
convertCheckBox->SetToolTip( _("Use the alternate shape of this component.\nFor gates, this is the \"De Morgan\" conversion") ); convertCheckBox->SetToolTip( _("Use the alternate shape of this component.\nFor gates, this is the \"De Morgan\" conversion") );
optionsSizer->Add( convertCheckBox, 0, wxALL, 8 ); optionsSizer->Add( convertCheckBox, 0, wxALL, 8 );
...@@ -117,11 +118,13 @@ DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP( ...@@ -117,11 +118,13 @@ DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP(
bShowRotateSizer = new wxBoxSizer( wxVERTICAL ); bShowRotateSizer = new wxBoxSizer( wxVERTICAL );
showCheckBox = new wxCheckBox( this, wxID_ANY, _("Show"), wxDefaultPosition, wxDefaultSize, 0 ); showCheckBox = new wxCheckBox( this, wxID_ANY, _("Show"), wxDefaultPosition, wxDefaultSize, 0 );
showCheckBox->SetToolTip( _("Check if you want this field visible") ); showCheckBox->SetToolTip( _("Check if you want this field visible") );
bShowRotateSizer->Add( showCheckBox, 0, wxALL, 5 ); bShowRotateSizer->Add( showCheckBox, 0, wxALL, 5 );
rotateCheckBox = new wxCheckBox( this, wxID_ANY, _("Rotate"), wxDefaultPosition, wxDefaultSize, 0 ); rotateCheckBox = new wxCheckBox( this, wxID_ANY, _("Rotate"), wxDefaultPosition, wxDefaultSize, 0 );
rotateCheckBox->SetToolTip( _("Check if you want this field's text rotated 90 degrees") ); rotateCheckBox->SetToolTip( _("Check if you want this field's text rotated 90 degrees") );
bShowRotateSizer->Add( rotateCheckBox, 0, wxALL, 5 ); bShowRotateSizer->Add( rotateCheckBox, 0, wxALL, 5 );
...@@ -132,6 +135,8 @@ DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP( ...@@ -132,6 +135,8 @@ DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP(
int m_StyleRadioBoxNChoices = sizeof( m_StyleRadioBoxChoices ) / sizeof( wxString ); int m_StyleRadioBoxNChoices = sizeof( m_StyleRadioBoxChoices ) / sizeof( wxString );
m_StyleRadioBox = new wxRadioBox( this, wxID_ANY, _("Style:"), wxDefaultPosition, wxDefaultSize, m_StyleRadioBoxNChoices, m_StyleRadioBoxChoices, 1, wxRA_SPECIFY_COLS ); m_StyleRadioBox = new wxRadioBox( this, wxID_ANY, _("Style:"), wxDefaultPosition, wxDefaultSize, m_StyleRadioBoxNChoices, m_StyleRadioBoxChoices, 1, wxRA_SPECIFY_COLS );
m_StyleRadioBox->SetSelection( 0 ); m_StyleRadioBox->SetSelection( 0 );
m_StyleRadioBox->SetToolTip( _("The style of the currently selected field's text in the schemati") );
visibilitySizer->Add( m_StyleRadioBox, 1, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); visibilitySizer->Add( m_StyleRadioBox, 1, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
fieldEditBoxSizer->Add( visibilitySizer, 0, wxEXPAND, 5 ); fieldEditBoxSizer->Add( visibilitySizer, 0, wxEXPAND, 5 );
...@@ -172,7 +177,7 @@ DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP( ...@@ -172,7 +177,7 @@ DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP(
textSizeBoxSizer->Add( textSizeLabel, 0, 0, 5 ); textSizeBoxSizer->Add( textSizeLabel, 0, 0, 5 );
textSizeTextCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); textSizeTextCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
textSizeTextCtrl->SetToolTip( _("The vertical height of the currently selected field's text in the schematic") ); textSizeTextCtrl->SetToolTip( _("The size of the currently selected field's text in the schematic") );
textSizeBoxSizer->Add( textSizeTextCtrl, 0, wxEXPAND, 5 ); textSizeBoxSizer->Add( textSizeTextCtrl, 0, wxEXPAND, 5 );
...@@ -189,6 +194,8 @@ DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP( ...@@ -189,6 +194,8 @@ DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP(
posXBoxSizer->Add( posXLabel, 0, 0, 5 ); posXBoxSizer->Add( posXLabel, 0, 0, 5 );
posXTextCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); posXTextCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
posXTextCtrl->SetToolTip( _("The X coordinate of the text relative to the component") );
posXBoxSizer->Add( posXTextCtrl, 0, wxEXPAND, 5 ); posXBoxSizer->Add( posXTextCtrl, 0, wxEXPAND, 5 );
positionBoxSizer->Add( posXBoxSizer, 1, wxALL|wxEXPAND, 5 ); positionBoxSizer->Add( posXBoxSizer, 1, wxALL|wxEXPAND, 5 );
......
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Aug 7 2008) // C++ code generated with wxFormBuilder (version Apr 16 2008)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO "NOT" EDIT THIS FILE! // PLEASE DO "NOT" EDIT THIS FILE!
...@@ -79,7 +79,6 @@ class DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP : public wxDialog ...@@ -79,7 +79,6 @@ class DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP : public wxDialog
public: public:
DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Component Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 864,640 ), long style = wxCAPTION|wxCLOSE_BOX|wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxMINIMIZE_BOX|wxRESIZE_BORDER|wxSYSTEM_MENU ); DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Component Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 864,640 ), long style = wxCAPTION|wxCLOSE_BOX|wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxMINIMIZE_BOX|wxRESIZE_BORDER|wxSYSTEM_MENU );
~DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP(); ~DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP();
......
...@@ -188,12 +188,12 @@ void KiConfigEeschemaFrame::CreateControls() ...@@ -188,12 +188,12 @@ void KiConfigEeschemaFrame::CreateControls()
wxButton* itemButton15 = new wxButton( itemDialog1, ADD_LIB, _("Add"), wxDefaultPosition, wxDefaultSize, 0 ); wxButton* itemButton15 = new wxButton( itemDialog1, ADD_LIB, _("Add"), wxDefaultPosition, wxDefaultSize, 0 );
if (KiConfigEeschemaFrame::ShowToolTips()) if (KiConfigEeschemaFrame::ShowToolTips())
itemButton15->SetToolTip(_("Add a new library after the selected library, add load it")); itemButton15->SetToolTip(_("Add a new library after the selected library, and load it"));
itemButton15->SetForegroundColour(wxColour(0, 128, 0)); itemButton15->SetForegroundColour(wxColour(0, 128, 0));
itemBoxSizer13->Add(itemButton15, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); itemBoxSizer13->Add(itemButton15, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
wxButton* itemButton16 = new wxButton( itemDialog1, INSERT_LIB, _("Ins"), wxDefaultPosition, wxDefaultSize, 0 ); wxButton* itemButton16 = new wxButton( itemDialog1, INSERT_LIB, _("Ins"), wxDefaultPosition, wxDefaultSize, 0 );
itemButton16->SetHelpText(_("Add a new library beforer the selected library, add load it")); itemButton16->SetHelpText(_("Add a new library before the selected library, and load it"));
if (KiConfigEeschemaFrame::ShowToolTips()) if (KiConfigEeschemaFrame::ShowToolTips())
itemButton16->SetToolTip(_("Add a new library beforer the selected library, add load it")); itemButton16->SetToolTip(_("Add a new library beforer the selected library, add load it"));
itemButton16->SetForegroundColour(wxColour(0, 0, 255)); itemButton16->SetForegroundColour(wxColour(0, 0, 255));
......
...@@ -812,7 +812,7 @@ ...@@ -812,7 +812,7 @@
<string name="proxy-Label">"Add"</string> <string name="proxy-Label">"Add"</string>
<bool name="proxy-Default">0</bool> <bool name="proxy-Default">0</bool>
<string name="proxy-Help text">""</string> <string name="proxy-Help text">""</string>
<string name="proxy-Tooltip text">"Add a new library after the selected library, add load it"</string> <string name="proxy-Tooltip text">"Add a new library after the selected library, and load it"</string>
<string name="proxy-Data variable">""</string> <string name="proxy-Data variable">""</string>
<string name="proxy-Data validator">""</string> <string name="proxy-Data validator">""</string>
<string name="proxy-Data source">""</string> <string name="proxy-Data source">""</string>
...@@ -878,7 +878,7 @@ ...@@ -878,7 +878,7 @@
<string name="proxy-Member variable name">""</string> <string name="proxy-Member variable name">""</string>
<string name="proxy-Label">"Ins"</string> <string name="proxy-Label">"Ins"</string>
<bool name="proxy-Default">0</bool> <bool name="proxy-Default">0</bool>
<string name="proxy-Help text">"Add a new library beforer the selected library, add load it"</string> <string name="proxy-Help text">"Add a new library before the selected library, and load it"</string>
<string name="proxy-Tooltip text">""</string> <string name="proxy-Tooltip text">""</string>
<string name="proxy-Data variable">""</string> <string name="proxy-Data variable">""</string>
<string name="proxy-Data validator">""</string> <string name="proxy-Data validator">""</string>
......
...@@ -143,7 +143,7 @@ void WinEDA_LibeditFrame::ExportOnePart( bool create_lib ) ...@@ -143,7 +143,7 @@ void WinEDA_LibeditFrame::ExportOnePart( bool create_lib )
wxString msg; wxString msg;
if( create_lib && success ) if( create_lib && success )
{ {
msg = Name + _( "0k" ); msg = Name + _( "Ok" );
DisplayInfo( this, DisplayInfo( this,
_("Note: this new library will be available only if it is loaded by eeschema.\nModify eeschema config if you want use it.") ); _("Note: this new library will be available only if it is loaded by eeschema.\nModify eeschema config if you want use it.") );
} }
......
...@@ -61,8 +61,8 @@ void WinEDA_SchematicFrame::ReCreateMenuBar() ...@@ -61,8 +61,8 @@ void WinEDA_SchematicFrame::ReCreateMenuBar()
item->SetBitmap( save_xpm ); item->SetBitmap( save_xpm );
filesMenu->Append( item ); filesMenu->Append( item );
item = new wxMenuItem( filesMenu, ID_SAVE_ONE_SHEET_AS, _( "Save &as.." ), item = new wxMenuItem( filesMenu, ID_SAVE_ONE_SHEET_AS, _( "Save &as..." ),
_( "Save current schematic sheet as.." ) ); _( "Save current schematic sheet as..." ) );
item->SetBitmap( save_as_xpm ); item->SetBitmap( save_as_xpm );
filesMenu->Append( item ); filesMenu->Append( item );
...@@ -230,7 +230,7 @@ void WinEDA_SchematicFrame::ReCreateMenuBar() ...@@ -230,7 +230,7 @@ void WinEDA_SchematicFrame::ReCreateMenuBar()
item->SetBitmap( add_glabel_xpm ); item->SetBitmap( add_glabel_xpm );
placeMenu->Append( item ); placeMenu->Append( item );
item = new wxMenuItem( placeMenu, ID_JUNCTION_BUTT, _( "Place Junction" ), item = new wxMenuItem( placeMenu, ID_JUNCTION_BUTT, _( "Junction" ),
_( "Place junction" ), wxITEM_NORMAL ); _( "Place junction" ), wxITEM_NORMAL );
item->SetBitmap( add_junction_xpm ); item->SetBitmap( add_junction_xpm );
placeMenu->Append( item ); placeMenu->Append( item );
...@@ -294,7 +294,7 @@ void WinEDA_SchematicFrame::ReCreateMenuBar() ...@@ -294,7 +294,7 @@ void WinEDA_SchematicFrame::ReCreateMenuBar()
// Options // Options
item = new wxMenuItem( configmenu, ID_OPTIONS_SETUP, _( "&Options" ), item = new wxMenuItem( configmenu, ID_OPTIONS_SETUP, _( "&Options" ),
_( "General options..." ) ); _( "Eeschema general options and preferences" ) );
item->SetBitmap( preference_xpm ); item->SetBitmap( preference_xpm );
configmenu->Append( item ); configmenu->Append( item );
......
...@@ -133,7 +133,7 @@ int WinEDA_GerberFrame::LoadOneGerberFile( const wxString& FullFileName, ...@@ -133,7 +133,7 @@ int WinEDA_GerberFrame::LoadOneGerberFile( const wxString& FullFileName,
mask += wxT( ";*.gbr;*.gbx;*.lgr;*.ger" ); mask += wxT( ";*.gbr;*.gbx;*.lgr;*.ger" );
filename = EDA_FileSelector( _( "Load gerber file" ), filename = EDA_FileSelector( _( "Open Gerber File:" ),
path, /* Chemin par defaut */ path, /* Chemin par defaut */
wxEmptyString, /* nom fichier par defaut */ wxEmptyString, /* nom fichier par defaut */
g_PhotoFilenameExt, /* extension par defaut */ g_PhotoFilenameExt, /* extension par defaut */
......
...@@ -29,11 +29,11 @@ void WinEDA_GerberFrame::ReCreateMenuBar( void ) ...@@ -29,11 +29,11 @@ void WinEDA_GerberFrame::ReCreateMenuBar( void )
menuBar = new wxMenuBar(); menuBar = new wxMenuBar();
wxMenu* filesMenu = new wxMenu; wxMenu* filesMenu = new wxMenu;
filesMenu->Append( ID_MENU_LOAD_FILE, _( "Clear and Load Gerber file" ), filesMenu->Append( ID_MENU_LOAD_FILE, _( "Clear and Load Gerber File" ),
_( "Clear all layers and Load new Gerber file" ), _( "Clear all layers and Load new Gerber file" ),
FALSE ); FALSE );
filesMenu->Append( ID_MENU_APPEND_FILE, _( "Load Gerber file" ), filesMenu->Append( ID_MENU_APPEND_FILE, _( "Load Gerber File" ),
_( "Load new Gerber file on currrent layer" ), _( "Load new Gerber file on currrent layer" ),
FALSE ); FALSE );
...@@ -45,7 +45,7 @@ void WinEDA_GerberFrame::ReCreateMenuBar( void ) ...@@ -45,7 +45,7 @@ void WinEDA_GerberFrame::ReCreateMenuBar( void )
filesMenu->Append( ID_GERBVIEW_LOAD_DCODE_FILE, _( "Load DCodes" ), filesMenu->Append( ID_GERBVIEW_LOAD_DCODE_FILE, _( "Load DCodes" ),
_( "Load D-Codes File" ), FALSE ); _( "Load D-Codes File" ), FALSE );
#if 0 #if 0
filesMenu->Append( ID_GERBVIEW_LOAD_DRILL_FILE, _( "Load drill" ), filesMenu->Append( ID_GERBVIEW_LOAD_DRILL_FILE, _( "Load Drill" ),
_( "Load excellon drill file" ), FALSE ); _( "Load excellon drill file" ), FALSE );
#endif #endif
...@@ -58,10 +58,10 @@ void WinEDA_GerberFrame::ReCreateMenuBar( void ) ...@@ -58,10 +58,10 @@ void WinEDA_GerberFrame::ReCreateMenuBar( void )
#if 0 #if 0
filesMenu->AppendSeparator(); filesMenu->AppendSeparator();
filesMenu->Append( ID_MENU_SAVE_BOARD, _( "&Save layers" ), filesMenu->Append( ID_MENU_SAVE_BOARD, _( "&Save Layers" ),
_( "Save current layers (GERBER format)" ), FALSE ); _( "Save current layers (GERBER format)" ), FALSE );
filesMenu->Append( ID_MENU_SAVE_BOARD_AS, _( "Save layers as.." ), filesMenu->Append( ID_MENU_SAVE_BOARD_AS, _( "Save Layers As..." ),
_( "Save current layers as.." ), FALSE ); _( "Save current layers as.." ), FALSE );
#endif #endif
...@@ -78,7 +78,7 @@ void WinEDA_GerberFrame::ReCreateMenuBar( void ) ...@@ -78,7 +78,7 @@ void WinEDA_GerberFrame::ReCreateMenuBar( void )
// Configuration: // Configuration:
wxMenu* configmenu = new wxMenu; wxMenu* configmenu = new wxMenu;
ADD_MENUITEM_WITH_HELP( configmenu, ID_CONFIG_REQ, _( "&File ext" ), ADD_MENUITEM_WITH_HELP( configmenu, ID_CONFIG_REQ, _( "&File Ext" ),
_( "Setting Files extension" ), config_xpm ); _( "Setting Files extension" ), config_xpm );
ADD_MENUITEM_WITH_HELP( configmenu, ID_COLORS_SETUP, _( "&Colors" ), ADD_MENUITEM_WITH_HELP( configmenu, ID_COLORS_SETUP, _( "&Colors" ),
_( "Select Colors and Display for layers" ), _( "Select Colors and Display for layers" ),
...@@ -116,19 +116,19 @@ void WinEDA_GerberFrame::ReCreateMenuBar( void ) ...@@ -116,19 +116,19 @@ void WinEDA_GerberFrame::ReCreateMenuBar( void )
_( "&List DCodes" ), _( "&List DCodes" ),
_( "List and edit D-codes" ), show_dcodenumber_xpm ); _( "List and edit D-codes" ), show_dcodenumber_xpm );
ADD_MENUITEM_WITH_HELP( miscellaneous_menu, ID_GERBVIEW_SHOW_SOURCE, ADD_MENUITEM_WITH_HELP( miscellaneous_menu, ID_GERBVIEW_SHOW_SOURCE,
_( "&Show source" ), _( "&Show Source" ),
_( "Show source file for the current layer" ), _( "Show source file for the current layer" ),
tools_xpm ); tools_xpm );
miscellaneous_menu->AppendSeparator(); miscellaneous_menu->AppendSeparator();
ADD_MENUITEM_WITH_HELP( miscellaneous_menu, ID_PCB_GLOBAL_DELETE, ADD_MENUITEM_WITH_HELP( miscellaneous_menu, ID_PCB_GLOBAL_DELETE,
_( "&Delete layer" ), _( "&Delete Layer" ),
_( "Delete current layer" ), general_deletions_xpm ); _( "Delete current layer" ), general_deletions_xpm );
// Menu Help: // Menu Help:
wxMenu* helpMenu = new wxMenu; wxMenu* helpMenu = new wxMenu;
ADD_MENUITEM_WITH_HELP( helpMenu, ID_GENERAL_HELP, _( "&Contents" ), ADD_MENUITEM_WITH_HELP( helpMenu, ID_GENERAL_HELP, _( "&Contents" ),
_( "Open the gerbview manual" ), help_xpm ); _( "Open the gerbview manual" ), help_xpm );
ADD_MENUITEM_WITH_HELP( helpMenu, ID_KICAD_ABOUT, _( "&About gerbview" ), ADD_MENUITEM_WITH_HELP( helpMenu, ID_KICAD_ABOUT, _( "&About Gerbview" ),
_( "About gerbview gerber and drill viewer" ), _( "About gerbview gerber and drill viewer" ),
info_xpm ); info_xpm );
......
No preview for this file type
This diff is collapsed.
...@@ -68,8 +68,8 @@ void WinEDA_MainFrame::Process_Files( wxCommandEvent& event ) ...@@ -68,8 +68,8 @@ void WinEDA_MainFrame::Process_Files( wxCommandEvent& event )
case ID_LOAD_PROJECT: case ID_LOAD_PROJECT:
SetLastProject( m_PrjFileName ); SetLastProject( m_PrjFileName );
fullfilename = EDA_FileSelector( IsNew ? _( "Create Project files:" ) : fullfilename = EDA_FileSelector( IsNew ? _( "Create Project file:" ) :
_( "Load Project files:" ), _( "Open Project file:" ),
path, /* Chemin par defaut */ path, /* Chemin par defaut */
wxEmptyString, /* nom fichier par defaut */ wxEmptyString, /* nom fichier par defaut */
g_Prj_Config_Filename_ext, /* extension par defaut */ g_Prj_Config_Filename_ext, /* extension par defaut */
......
...@@ -82,7 +82,7 @@ void WinEDA_MainFrame::Save_Prj_Config() ...@@ -82,7 +82,7 @@ void WinEDA_MainFrame::Save_Prj_Config()
FullFileName = m_PrjFileName; FullFileName = m_PrjFileName;
ChangeFileNameExt( FullFileName, g_Prj_Config_Filename_ext ); ChangeFileNameExt( FullFileName, g_Prj_Config_Filename_ext );
FullFileName = EDA_FileSelector( _( "Save project file" ), FullFileName = EDA_FileSelector( _( "Save Project File:" ),
wxGetCwd(), /* Chemin par defaut */ wxGetCwd(), /* Chemin par defaut */
FullFileName, /* nom fichier par defaut */ FullFileName, /* nom fichier par defaut */
g_Prj_Config_Filename_ext, /* extension par defaut */ g_Prj_Config_Filename_ext, /* extension par defaut */
......
...@@ -89,7 +89,7 @@ DIALOG_SVG_PRINT_base::DIALOG_SVG_PRINT_base( wxWindow* parent, wxWindowID id, c ...@@ -89,7 +89,7 @@ DIALOG_SVG_PRINT_base::DIALOG_SVG_PRINT_base( wxWindow* parent, wxWindowID id, c
bMainSizer->Add( m_staticText1, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); bMainSizer->Add( m_staticText1, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
m_FileNameCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_FileNameCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
m_FileNameCtrl->SetToolTip( _("Enter a filename if you do not want to use defaults files names\nCan be used only when printing the current sheet") ); m_FileNameCtrl->SetToolTip( _("Enter a filename if you do not want to use default file names\nCan be used only when printing the current sheet") );
m_FileNameCtrl->SetMinSize( wxSize( 450,-1 ) ); m_FileNameCtrl->SetMinSize( wxSize( 450,-1 ) );
bMainSizer->Add( m_FileNameCtrl, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); bMainSizer->Add( m_FileNameCtrl, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
......
...@@ -645,7 +645,7 @@ ...@@ -645,7 +645,7 @@
<property name="size"></property> <property name="size"></property>
<property name="style"></property> <property name="style"></property>
<property name="subclass"></property> <property name="subclass"></property>
<property name="tooltip">Enter a filename if you do not want to use defaults files names&#x0A;Can be used only when printing the current sheet</property> <property name="tooltip">Enter a filename if you do not want to use default file names&#x0A;Can be used only when printing the current sheet</property>
<property name="value"></property> <property name="value"></property>
<property name="window_extra_style"></property> <property name="window_extra_style"></property>
<property name="window_name"></property> <property name="window_name"></property>
......
...@@ -276,7 +276,7 @@ bool dialog_copper_zone::AcceptOptions( bool aPromptForErrors, bool aUseExportab ...@@ -276,7 +276,7 @@ bool dialog_copper_zone::AcceptOptions( bool aPromptForErrors, bool aUseExportab
{ {
DisplayError( this, DisplayError( this,
_( _(
"Error :\nyou must choose a copper min thickness value bigger than 0.001 inch or 0.0254 mm)" ) ); "Error :\nyou must choose a copper min thickness value bigger than 0.001 inch (or 0.0254 mm)" ) );
return false; return false;
} }
......
...@@ -41,7 +41,7 @@ dialog_copper_zone_base::dialog_copper_zone_base( wxWindow* parent, wxWindowID i ...@@ -41,7 +41,7 @@ dialog_copper_zone_base::dialog_copper_zone_base( wxWindow* parent, wxWindowID i
int m_FillModeCtrlNChoices = sizeof( m_FillModeCtrlChoices ) / sizeof( wxString ); int m_FillModeCtrlNChoices = sizeof( m_FillModeCtrlChoices ) / sizeof( wxString );
m_FillModeCtrl = new wxRadioBox( this, ID_RADIOBOX_FILL_MODE_SELECTION, _("Filling Mode:"), wxDefaultPosition, wxDefaultSize, m_FillModeCtrlNChoices, m_FillModeCtrlChoices, 1, wxRA_SPECIFY_COLS ); m_FillModeCtrl = new wxRadioBox( this, ID_RADIOBOX_FILL_MODE_SELECTION, _("Filling Mode:"), wxDefaultPosition, wxDefaultSize, m_FillModeCtrlNChoices, m_FillModeCtrlChoices, 1, wxRA_SPECIFY_COLS );
m_FillModeCtrl->SetSelection( 1 ); m_FillModeCtrl->SetSelection( 1 );
m_FillModeCtrl->SetToolTip( _("Filled areas can use solid polygons or segments.\nDepending on the complexity and the size of the zone,\nsometime polygons are better and sometime segments are better") ); m_FillModeCtrl->SetToolTip( _("Filled areas can use solid polygons or segments.\nDepending on the complexity and the size of the zone,\nsometimes polygons are better and sometimes segments are better.") );
m_FillOptionsBox->Add( m_FillModeCtrl, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); m_FillOptionsBox->Add( m_FillModeCtrl, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
...@@ -147,9 +147,9 @@ dialog_copper_zone_base::dialog_copper_zone_base( wxWindow* parent, wxWindowID i ...@@ -147,9 +147,9 @@ dialog_copper_zone_base::dialog_copper_zone_base( wxWindow* parent, wxWindowID i
wxBoxSizer* m_RightBoxSizer; wxBoxSizer* m_RightBoxSizer;
m_RightBoxSizer = new wxBoxSizer( wxVERTICAL ); m_RightBoxSizer = new wxBoxSizer( wxVERTICAL );
m_ExportSetupButton = new wxButton( this, wxID_BUTTON_EXPORT, _("Export Setup to others zones"), wxDefaultPosition, wxDefaultSize, 0 ); m_ExportSetupButton = new wxButton( this, wxID_BUTTON_EXPORT, _("Export Setup to other zones"), wxDefaultPosition, wxDefaultSize, 0 );
m_ExportSetupButton->SetForegroundColour( wxColour( 51, 111, 40 ) ); m_ExportSetupButton->SetForegroundColour( wxColour( 51, 111, 40 ) );
m_ExportSetupButton->SetToolTip( _("Export this zone setup to all others copper zones") ); m_ExportSetupButton->SetToolTip( _("Export this zone setup to all other copper zones") );
m_RightBoxSizer->Add( m_ExportSetupButton, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 ); m_RightBoxSizer->Add( m_ExportSetupButton, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
......
...@@ -141,7 +141,7 @@ ...@@ -141,7 +141,7 @@
<property name="size"></property> <property name="size"></property>
<property name="style">wxRA_SPECIFY_COLS</property> <property name="style">wxRA_SPECIFY_COLS</property>
<property name="subclass"></property> <property name="subclass"></property>
<property name="tooltip">Filled areas can use solid polygons or segments.&#x0A;Depending on the complexity and the size of the zone,&#x0A;sometime polygons are better and sometime segments are better</property> <property name="tooltip">Filled areas can use solid polygons or segments.&#x0A;Depending on the complexity and the size of the zone,&#x0A;sometimes polygons are better and sometimes segments are better.</property>
<property name="window_extra_style"></property> <property name="window_extra_style"></property>
<property name="window_name"></property> <property name="window_name"></property>
<property name="window_style"></property> <property name="window_style"></property>
...@@ -923,7 +923,7 @@ ...@@ -923,7 +923,7 @@
<property name="font"></property> <property name="font"></property>
<property name="hidden">0</property> <property name="hidden">0</property>
<property name="id">wxID_BUTTON_EXPORT</property> <property name="id">wxID_BUTTON_EXPORT</property>
<property name="label">Export Setup to others zones</property> <property name="label">Export Setup to other zones</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="name">m_ExportSetupButton</property> <property name="name">m_ExportSetupButton</property>
...@@ -932,7 +932,7 @@ ...@@ -932,7 +932,7 @@
<property name="size"></property> <property name="size"></property>
<property name="style"></property> <property name="style"></property>
<property name="subclass"></property> <property name="subclass"></property>
<property name="tooltip">Export this zone setup to all others copper zones</property> <property name="tooltip">Export this zone setup to all other copper zones</property>
<property name="window_extra_style"></property> <property name="window_extra_style"></property>
<property name="window_name"></property> <property name="window_name"></property>
<property name="window_style"></property> <property name="window_style"></property>
......
...@@ -35,10 +35,10 @@ DialogGeneralOptionsBoardEditor_base::DialogGeneralOptionsBoardEditor_base( wxWi ...@@ -35,10 +35,10 @@ DialogGeneralOptionsBoardEditor_base::DialogGeneralOptionsBoardEditor_base( wxWi
bLeftSizer->Add( m_UnitsSelection, 0, wxALL|wxEXPAND, 5 ); bLeftSizer->Add( m_UnitsSelection, 0, wxALL|wxEXPAND, 5 );
wxString m_CursorShapeChoices[] = { _("Smass cross"), _("Full screen cursor") }; wxString m_CursorShapeChoices[] = { _("Small cross"), _("Full screen cursor") };
int m_CursorShapeNChoices = sizeof( m_CursorShapeChoices ) / sizeof( wxString ); int m_CursorShapeNChoices = sizeof( m_CursorShapeChoices ) / sizeof( wxString );
m_CursorShape = new wxRadioBox( this, wxID_CURSOR_SHAPE, _("Cursor"), wxDefaultPosition, wxDefaultSize, m_CursorShapeNChoices, m_CursorShapeChoices, 1, wxRA_SPECIFY_COLS ); m_CursorShape = new wxRadioBox( this, wxID_CURSOR_SHAPE, _("Cursor"), wxDefaultPosition, wxDefaultSize, m_CursorShapeNChoices, m_CursorShapeChoices, 1, wxRA_SPECIFY_COLS );
m_CursorShape->SetSelection( 1 ); m_CursorShape->SetSelection( 0 );
m_CursorShape->SetToolTip( _("Main cursor shape selection (small cross or large cursor)") ); m_CursorShape->SetToolTip( _("Main cursor shape selection (small cross or large cursor)") );
bLeftSizer->Add( m_CursorShape, 0, wxALL|wxEXPAND, 5 ); bLeftSizer->Add( m_CursorShape, 0, wxALL|wxEXPAND, 5 );
......
...@@ -198,7 +198,7 @@ ...@@ -198,7 +198,7 @@
<property name="proportion">0</property> <property name="proportion">0</property>
<object class="wxRadioBox" expanded="1"> <object class="wxRadioBox" expanded="1">
<property name="bg"></property> <property name="bg"></property>
<property name="choices">&quot;Smass cross&quot; &quot;Full screen cursor&quot;</property> <property name="choices">&quot;Small cross&quot; &quot;Full screen cursor&quot;</property>
<property name="context_help"></property> <property name="context_help"></property>
<property name="enabled">1</property> <property name="enabled">1</property>
<property name="fg"></property> <property name="fg"></property>
...@@ -212,7 +212,7 @@ ...@@ -212,7 +212,7 @@
<property name="name">m_CursorShape</property> <property name="name">m_CursorShape</property>
<property name="permission">protected</property> <property name="permission">protected</property>
<property name="pos"></property> <property name="pos"></property>
<property name="selection">1</property> <property name="selection">0</property>
<property name="size"></property> <property name="size"></property>
<property name="style">wxRA_SPECIFY_COLS</property> <property name="style">wxRA_SPECIFY_COLS</property>
<property name="subclass"></property> <property name="subclass"></property>
......
...@@ -164,7 +164,7 @@ void WinEDA_NetlistFrame::CreateControls() ...@@ -164,7 +164,7 @@ void WinEDA_NetlistFrame::CreateControls()
m_Select_By_Timestamp = new wxRadioBox( itemDialog1, ID_SELECTION_FOOTPRINT_MODE, _("Module Selection:"), wxDefaultPosition, wxDefaultSize, m_Select_By_TimestampStrings, 1, wxRA_SPECIFY_COLS ); m_Select_By_Timestamp = new wxRadioBox( itemDialog1, ID_SELECTION_FOOTPRINT_MODE, _("Module Selection:"), wxDefaultPosition, wxDefaultSize, m_Select_By_TimestampStrings, 1, wxRA_SPECIFY_COLS );
m_Select_By_Timestamp->SetSelection(0); m_Select_By_Timestamp->SetSelection(0);
if (WinEDA_NetlistFrame::ShowToolTips()) if (WinEDA_NetlistFrame::ShowToolTips())
m_Select_By_Timestamp->SetToolTip(_("Select how footprints are reconized:\nby their reference (U1, R3...) (normal setting)\nor their time stamp (special setting after a full schematic reannotation)")); m_Select_By_Timestamp->SetToolTip(_("Select how footprints are recognized:\nby their reference (U1, R3...) (normal setting)\nor their time stamp (special setting after a full schematic reannotation)"));
itemBoxSizer5->Add(m_Select_By_Timestamp, 0, wxGROW|wxALL, 5); itemBoxSizer5->Add(m_Select_By_Timestamp, 0, wxGROW|wxALL, 5);
wxArrayString m_ChangeExistingFootprintCtrlStrings; wxArrayString m_ChangeExistingFootprintCtrlStrings;
......
...@@ -169,7 +169,7 @@ int WinEDA_PcbFrame::LoadOnePcbFile( const wxString& FullFileName, bool Append ) ...@@ -169,7 +169,7 @@ int WinEDA_PcbFrame::LoadOnePcbFile( const wxString& FullFileName, bool Append )
{ {
msg = wxT( "*" ) + PcbExtBuffer; msg = wxT( "*" ) + PcbExtBuffer;
fileName = fileName =
EDA_FileSelector( _( "Load board files:" ), EDA_FileSelector( _( "Open Board File:" ),
wxEmptyString, /* Chemin par defaut */ wxEmptyString, /* Chemin par defaut */
GetScreen()->m_FileName, /* nom fichier par defaut */ GetScreen()->m_FileName, /* nom fichier par defaut */
PcbExtBuffer, /* extension par defaut */ PcbExtBuffer, /* extension par defaut */
......
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