Commit cf918c05 authored by plyatov's avatar plyatov

Some terminology corrections and russian translation update.

parent 813d303c
......@@ -96,12 +96,14 @@ bool WinEDA_CreateCmpDialog::Create( WinEDA_DrawFrame* parent, wxWindowID id, co
////@end WinEDA_CreateCmpDialog member initialisation
////@begin WinEDA_CreateCmpDialog creation
SetExtraStyle(GetExtraStyle()|wxWS_EX_BLOCK_EVENTS);
SetExtraStyle(wxWS_EX_BLOCK_EVENTS);
wxDialog::Create( parent, id, caption, pos, size, style );
CreateControls();
GetSizer()->Fit(this);
GetSizer()->SetSizeHints(this);
if (GetSizer())
{
GetSizer()->SetSizeHints(this);
}
Centre();
////@end WinEDA_CreateCmpDialog creation
return TRUE;
......@@ -141,8 +143,6 @@ void WinEDA_CreateCmpDialog::CreateControls()
SetFont(*g_DialogFont);
////@begin WinEDA_CreateCmpDialog content construction
// Generated by DialogBlocks, 30/05/2006 08:00:22 (unregistered)
WinEDA_CreateCmpDialog* itemDialog1 = this;
wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxVERTICAL);
......@@ -207,35 +207,35 @@ void WinEDA_CreateCmpDialog::CreateControls()
wxBoxSizer* itemBoxSizer19 = new wxBoxSizer(wxHORIZONTAL);
itemBoxSizer2->Add(itemBoxSizer19, 0, wxGROW|wxALL, 5);
wxString m_PartsCountStrings[] = {
_("&1"),
_("&2"),
_("&3"),
_("&4"),
_("&5"),
_("&6"),
_("&7"),
_("&8"),
_("&9"),
_("&10"),
_("&11"),
_("&12"),
_("&13"),
_("&14"),
_("&15"),
_("&16"),
_("&17"),
_("&18"),
_("&19"),
_("&20"),
_("&21"),
_("&22"),
_("&23"),
_("&24"),
_("&25"),
_("&26")
};
m_PartsCount = new wxRadioBox( itemDialog1, ID_RADIOBOX, _("Parts per package"), wxDefaultPosition, wxDefaultSize, 26, m_PartsCountStrings, 9, wxRA_SPECIFY_ROWS );
wxArrayString m_PartsCountStrings;
m_PartsCountStrings.Add(_("&1"));
m_PartsCountStrings.Add(_("&2"));
m_PartsCountStrings.Add(_("&3"));
m_PartsCountStrings.Add(_("&4"));
m_PartsCountStrings.Add(_("&5"));
m_PartsCountStrings.Add(_("&6"));
m_PartsCountStrings.Add(_("&7"));
m_PartsCountStrings.Add(_("&8"));
m_PartsCountStrings.Add(_("&9"));
m_PartsCountStrings.Add(_("&10"));
m_PartsCountStrings.Add(_("&11"));
m_PartsCountStrings.Add(_("&12"));
m_PartsCountStrings.Add(_("&13"));
m_PartsCountStrings.Add(_("&14"));
m_PartsCountStrings.Add(_("&15"));
m_PartsCountStrings.Add(_("&16"));
m_PartsCountStrings.Add(_("&17"));
m_PartsCountStrings.Add(_("&18"));
m_PartsCountStrings.Add(_("&19"));
m_PartsCountStrings.Add(_("&20"));
m_PartsCountStrings.Add(_("&21"));
m_PartsCountStrings.Add(_("&22"));
m_PartsCountStrings.Add(_("&23"));
m_PartsCountStrings.Add(_("&24"));
m_PartsCountStrings.Add(_("&25"));
m_PartsCountStrings.Add(_("&26"));
m_PartsCount = new wxRadioBox( itemDialog1, ID_RADIOBOX, _("Parts per component"), wxDefaultPosition, wxDefaultSize, m_PartsCountStrings, 9, wxRA_SPECIFY_ROWS );
m_PartsCount->SetSelection(0);
itemBoxSizer19->Add(m_PartsCount, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
itemBoxSizer19->Add(5, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
......@@ -244,7 +244,7 @@ void WinEDA_CreateCmpDialog::CreateControls()
wxStaticBoxSizer* itemStaticBoxSizer22 = new wxStaticBoxSizer(itemStaticBoxSizer22Static, wxVERTICAL);
itemBoxSizer19->Add(itemStaticBoxSizer22, 0, wxGROW|wxALL, 5);
m_ShowPinNum = new wxCheckBox( itemDialog1, ID_CHECKBOX1, _("Show Pin Num"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE );
m_ShowPinNum = new wxCheckBox( itemDialog1, ID_CHECKBOX1, _("Show Pin Number"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE );
m_ShowPinNum->SetValue(true);
itemStaticBoxSizer22->Add(m_ShowPinNum, 0, wxALIGN_LEFT|wxALL, 5);
......
......@@ -41,11 +41,6 @@ class wxSpinCtrl;
////@begin control identifiers
#define ID_DIALOG 10000
#define SYMBOL_WINEDA_CREATECMPDIALOG_STYLE wxCAPTION|wxSYSTEM_MENU|wxCLOSE_BOX|MAYBE_RESIZE_BORDER
#define SYMBOL_WINEDA_CREATECMPDIALOG_TITLE _("Component Creation")
#define SYMBOL_WINEDA_CREATECMPDIALOG_IDNAME ID_DIALOG
#define SYMBOL_WINEDA_CREATECMPDIALOG_SIZE wxSize(400, 300)
#define SYMBOL_WINEDA_CREATECMPDIALOG_POSITION wxDefaultPosition
#define ID_TEXTCTRL1 10009
#define ID_TEXTCTRL 10008
#define ID_CHECKBOX3 10005
......@@ -56,6 +51,11 @@ class wxSpinCtrl;
#define ID_CHECKBOX5 10007
#define ID_CHECKBOX 10001
#define ID_SPINCTRL 10010
#define SYMBOL_WINEDA_CREATECMPDIALOG_STYLE wxCAPTION|wxSYSTEM_MENU|wxCLOSE_BOX|MAYBE_RESIZE_BORDER
#define SYMBOL_WINEDA_CREATECMPDIALOG_TITLE _("Component Creation")
#define SYMBOL_WINEDA_CREATECMPDIALOG_IDNAME ID_DIALOG
#define SYMBOL_WINEDA_CREATECMPDIALOG_SIZE wxSize(400, 300)
#define SYMBOL_WINEDA_CREATECMPDIALOG_POSITION wxDefaultPosition
////@end control identifiers
/*!
......
This diff is collapsed.
......@@ -141,7 +141,7 @@ void WinEDA_PartPropertiesFrame::CreateControls()
m_PanelBasicBoxSizer->Add(itemBoxSizer7, 0, wxALIGN_LEFT|wxALL, 5);
wxBoxSizer* itemBoxSizer8 = new wxBoxSizer(wxVERTICAL);
itemBoxSizer7->Add(itemBoxSizer8, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
wxStaticText* itemStaticText9 = new wxStaticText( m_PanelBasic, wxID_STATIC, _("Number of Units:"), wxDefaultPosition, wxDefaultSize, 0 );
wxStaticText* itemStaticText9 = new wxStaticText( m_PanelBasic, wxID_STATIC, _("Number of Parts:"), wxDefaultPosition, wxDefaultSize, 0 );
itemBoxSizer8->Add(itemStaticText9, 0, wxGROW|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5);
SelNumberOfUnits = new wxSpinCtrl( m_PanelBasic, ID_SPINCTRL1, _T("0"), wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 1, 26, 0 );
......
......@@ -36,7 +36,7 @@ EDA_LibComponentStruct *LibEntry;
int err = 1;
mask = wxT("*") + g_LibExtBuffer;
Name = EDA_FileSelector( _("Import part:"),
Name = EDA_FileSelector( _("Import component:"),
wxEmptyString, /* Chemin par defaut */
wxEmptyString, /* nom fichier par defaut */
g_LibExtBuffer, /* extension par defaut */
......@@ -98,7 +98,7 @@ int err;
mask = wxT("*") + g_LibExtBuffer;
wxString def_path;
if ( create_lib ) def_path = g_RealLibDirBuffer;
Name = EDA_FileSelector( create_lib ? _("New Library") : _("Export part:"),
Name = EDA_FileSelector( create_lib ? _("New Library") : _("Export component:"),
def_path, /* Chemin par defaut */
Name, /* nom fichier par defaut */
g_LibExtBuffer, /* extension par defaut */
......@@ -134,7 +134,7 @@ wxString msg;
{
msg = Name + _("0k");
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.") );
}
else msg = _("Error while create ") + Name;
Affiche_Message(msg);
......
......@@ -232,7 +232,7 @@ int err;
Name = MakeFileName(g_RealLibDirBuffer, CurrentLib->m_Name, g_LibExtBuffer);
msg = _("Ok to modify Library File ") + Name;
msg = _("Modify Library File \"") + Name + _("\" ?");
if( ! IsOK(this, msg) ) return;
err = SaveOneLibrary(this, Name, CurrentLib);
......@@ -241,15 +241,15 @@ int err;
if ( err )
{
msg = _("Error while saving Library File ") + Name;
msg = _("Error while saving Library File \"") + Name + _("\"");
Affiche_1_Parametre(this, 1, wxT(" *** ERROR : **"), msg,BLUE);
DisplayError(this, msg);
}
else
{
msg = _("Library File ") + Name + wxT(" Ok");
msg = _("Library File \"") + Name + wxT("\" Ok");
ChangeFileNameExt(Name,DOC_EXT);
wxString msg1 = _("Document File ") + Name + wxT(" Ok");
wxString msg1 = _("Document File \"") + Name + wxT("\" Ok");
Affiche_1_Parametre(this, 1,msg, msg1,BLUE);
}
}
......@@ -345,8 +345,8 @@ wxString msg;
else
{
msg = _("Delete component ") + LibEntry->m_Name.m_Text +
_(" in library ") + CurrentLib->m_Name + wxT("?");
msg = _("Delete component \"") + LibEntry->m_Name.m_Text +
_("\" from library \"") + CurrentLib->m_Name + wxT("\"?");
if( IsOK(this, msg) )
{
DeletePartInLib( CurrentLib, LibEntry );
......@@ -370,7 +370,7 @@ EDA_LibComponentStruct * NewStruct;
int diag;
if( CurrentLibEntry )
if( ! IsOK(this, _("Delete old component ?")) ) return;
if( ! IsOK(this, _("Delete old component?")) ) return;
CurrentDrawItem = NULL;
......@@ -387,8 +387,8 @@ int diag;
if( FindLibPart(msg.GetData(), CurrentLib->m_Name, FIND_ALIAS) )
{
wxString msg;
msg << _("Component ") << msg <<
_(" exists in library ") << CurrentLib->m_Name;
msg << _("Component \"") << Dialogbox.ReturnCmpName() <<
_("\" exists in library \"") << CurrentLib->m_Name << _("\".");
DisplayError(this, msg);
return;
}
......@@ -555,14 +555,14 @@ bool NewCmp = TRUE;
if(CurrentLibEntry == NULL)
{
DisplayError(this, _("Warning: No component to Save") ); return;
DisplayError(this, _("No component to Save.") ); return;
}
if(CurrentLib == NULL) SelectActiveLibrary();
if(CurrentLib == NULL)
{
DisplayError(this, _("No Library specified"), 20); return;
DisplayError(this, _("No Library specified."), 20); return;
}
CurrentLib->m_Modified = 1;
......@@ -573,7 +573,7 @@ bool NewCmp = TRUE;
if( (Entry = FindLibPart(CurrentLibEntry->m_Name.m_Text.GetData(),
CurrentLib->m_Name, FIND_ROOT)) != NULL)
{
msg.Printf( _("Component %s exists, Change it ?"),
msg.Printf( _("Component \"%s\" exists. Change it?"),
Entry->m_Name.m_Text.GetData());
if( !IsOK(this, msg) ) return;
NewCmp = FALSE;
......
......@@ -102,7 +102,7 @@ void WinEDA_LibeditFrame::OnCloseWindow( wxCloseEvent& Event )
if( m_CurrentScreen->IsModify() )
{
if( !IsOK( this, _( "LibEdit: Part modified!, Continue ?" ) ) )
if( !IsOK( this, _( "Component was modified!\nDiscard changes?" ) ) )
{
Event.Veto(); return;
}
......@@ -115,7 +115,7 @@ void WinEDA_LibeditFrame::OnCloseWindow( wxCloseEvent& Event )
if( Lib->m_Modified )
{
wxString msg;
msg.Printf( _( "Library %s modified!, Continue ?" ), Lib->m_Name.GetData() );
msg.Printf( _( "Library \"%s\" was modified!\nDiscard changes?" ), Lib->m_Name.GetData() );
if( !IsOK( this, msg ) )
{
Event.Veto(); return;
......@@ -404,7 +404,7 @@ void WinEDA_LibeditFrame::Process_Special_Functions( wxCommandEvent& event )
case ID_LIBEDIT_CHECK_PART:
if( CurrentLibEntry )
if( TestPins( CurrentLibEntry ) == FALSE )
DisplayInfo( this, _( " Tst Pins OK!" ) );
DisplayInfo( this, _( " Pins Test OK!" ) );
break;
case ID_DE_MORGAN_NORMAL_BUTT:
......@@ -482,7 +482,7 @@ void WinEDA_LibeditFrame::Process_Special_Functions( wxCommandEvent& event )
}
else
{
SetToolID( id, wxCURSOR_ARROW, _( "Set Pin Opt" ) );
SetToolID( id, wxCURSOR_ARROW, _( "Set Pin Options" ) );
InstallPineditFrame( this, &dc, pos );
SetToolID( 0, wxCURSOR_ARROW, wxEmptyString );
}
......
......@@ -123,28 +123,28 @@ void WinEDA_LibeditFrame::ReCreateHToolbar()
_( "Select working library" ) );
m_HToolBar->AddTool( ID_LIBEDIT_DELETE_PART, wxEmptyString, BITMAP( delete_xpm ),
_( "Delete part in current library" ) );
_( "Delete component in current library" ) );
m_HToolBar->AddSeparator();
m_HToolBar->AddTool( ID_LIBEDIT_NEW_PART, wxEmptyString, BITMAP( new_component_xpm ),
_( "New part" ) );
_( "New component" ) );
m_HToolBar->AddTool( ID_LIBEDIT_SELECT_PART, BITMAP( add_component_xpm ),
_( "Select part to edit" ) );
_( "Select component to edit" ) );
m_HToolBar->AddTool( ID_LIBEDIT_SAVE_CURRENT_PART, wxEmptyString,
BITMAP( save_part_in_mem_xpm ),
_( "Save current part into current loaded library (in memory)" ) );
_( "Save current component into current loaded library (in memory)" ) );
m_HToolBar->AddTool( ID_LIBEDIT_IMPORT_PART, wxEmptyString, BITMAP( import_xpm ),
_( "import part" ) );
_( "import component" ) );
m_HToolBar->AddTool( ID_LIBEDIT_EXPORT_PART, wxEmptyString, BITMAP( export_xpm ),
_( "export part" ) );
_( "export component" ) );
m_HToolBar->AddTool( ID_LIBEDIT_CREATE_NEW_LIB_AND_SAVE_CURRENT_PART,
wxEmptyString, BITMAP( new_library_xpm ),
_( "Create a new library an save current part into" ) );
_( "Create a new library an save current component into" ) );
m_HToolBar->AddSeparator();
msg = AddHotkeyName( _( "Undo last edition" ), s_Schematic_Hokeys_Descr, HK_UNDO );
......@@ -157,7 +157,7 @@ void WinEDA_LibeditFrame::ReCreateHToolbar()
wxNullBitmap,
FALSE,
-1, -1, (wxObject*) NULL,
_( "Edit Part Properties" ) );
_( "Edit component properties" ) );
m_HToolBar->AddSeparator();
m_HToolBar->AddTool( ID_LIBEDIT_CHECK_PART, BITMAP( erc_xpm ),
......
No preview for this file type
This source diff could not be displayed because it is too large. You can view the blob instead.
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