From 8724386be2a8068a31bc60f63e0b626fea396586 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Mon, 1 Nov 2010 19:33:44 +0100 Subject: [PATCH] fix minor issues in internationalized strings --- 3d-viewer/3d_toolbar.cpp | 6 +- AUTHORS.txt | 15 +- CHANGELOG.txt | 2 +- common/basicframe.cpp | 2 +- .../dialog_edit_component_in_lib_base.cpp | 17 +- .../dialog_edit_component_in_lib_base.fbp | 188 +++++++++++++++++- eeschema/dialog_edit_component_in_lib_base.h | 23 ++- eeschema/eelibs_read_libraryfiles.cpp | 2 +- eeschema/files-io.cpp | 2 +- gerbview/gerberframe.cpp | 2 +- gerbview/initpcb.cpp | 2 +- gerbview/menubar.cpp | 4 +- 12 files changed, 220 insertions(+), 45 deletions(-) diff --git a/3d-viewer/3d_toolbar.cpp b/3d-viewer/3d_toolbar.cpp index 3e744e3d80..f2dcdbffa9 100644 --- a/3d-viewer/3d_toolbar.cpp +++ b/3d-viewer/3d_toolbar.cpp @@ -87,11 +87,11 @@ void WinEDA3D_DrawFrame::ReCreateHToolbar() _( "Move up ^" ) ); m_HToolBar->AddTool( ID_MOVE3D_DOWN, wxEmptyString, wxBitmap( down_xpm ), - _( "Move down" ) ); - + _( "Move down v" ) ); + m_HToolBar->AddSeparator(); m_HToolBar->AddTool( ID_ORTHO, wxEmptyString, wxBitmap( ortho_xpm ), - _( "Enable/Disable ortographic projection" ), + _( "Enable/Disable orthographic projection" ), wxITEM_CHECK ); m_HToolBar->Realize(); diff --git a/AUTHORS.txt b/AUTHORS.txt index 6a33c2dc5c..00f56b44d5 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -1,17 +1,13 @@ -* Copyright (C) 1992-2009 Jean-Pierre Charras -* Copyright (C) 1992-2009 Kicad Developers Team +* Copyright (C) 1992-2010 Jean-Pierre Charras +* Copyright (C) 1992-2010 Kicad Developers Team * under GNU General Public License (see copyright.txt) -== Main Author +== Main Authors Jean-Pierre Charras -IUT1 GEII2 -Universite Joseph Fourier (U.J.F.) -Saint Martin d'Hères (38402) -Laboratiore GIPSA-Lab -Saint Martin d'Hères +Dick Hollenbeck +Wayne Stambaugh == Contributors -Dick Hollenbeck Hauptmech Jerry Jacobs Jonas Diemer @@ -21,7 +17,6 @@ Marco Serantoni (OSX maintener) Rok Markovic Tim Hanson Vesa Solonen -Wayne Stambaugh See also CHANGELOG.txt for contributors. diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 9307fcd490..b5d10e7a1d 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -4,7 +4,7 @@ KiCad ChangeLog 2010 Please add newer entries at the top, list the date and your name with email address. -2010-oct-15, UPDATE Jean-Pierre Charras +2010-oct-28, UPDATE Jean-Pierre Charras ================================================================================ PolyLine.cpp: remove unused method CPolyLine::TestPointInsideContour() which was a duplicate of diff --git a/common/basicframe.cpp b/common/basicframe.cpp index d35dd65f8e..417abbcea6 100644 --- a/common/basicframe.cpp +++ b/common/basicframe.cpp @@ -259,7 +259,7 @@ void WinEDA_BasicFrame::GetKicadHelp( wxCommandEvent& event ) } else { - msg.Printf( _( "Help file %s not found" ), GetChars( wxGetApp().m_HelpFileName ) ); + msg.Printf( _( "Help file %s not found." ), GetChars( wxGetApp().m_HelpFileName ) ); DisplayError( this, msg ); } diff --git a/eeschema/dialog_edit_component_in_lib_base.cpp b/eeschema/dialog_edit_component_in_lib_base.cpp index 5877403740..5afd6dcb25 100644 --- a/eeschema/dialog_edit_component_in_lib_base.cpp +++ b/eeschema/dialog_edit_component_in_lib_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Apr 16 2008) +// C++ code generated with wxFormBuilder (version Sep 8 2010) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -25,28 +25,24 @@ DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE( wx m_OptionsBoxSizer = new wxStaticBoxSizer( new wxStaticBox( m_PanelBasic, wxID_ANY, _("General :") ), wxVERTICAL ); m_AsConvertButt = new wxCheckBox( m_PanelBasic, wxID_ANY, _("As Convert"), wxDefaultPosition, wxDefaultSize, 0 ); - m_AsConvertButt->SetToolTip( _("Check this option for components that have a De Morgan representation.\nThis is usual for gates.") ); m_OptionsBoxSizer->Add( m_AsConvertButt, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); m_ShowPinNumButt = new wxCheckBox( m_PanelBasic, wxID_ANY, _("Show Pin Num"), wxDefaultPosition, wxDefaultSize, 0 ); - m_ShowPinNumButt->SetValue(true); - + m_ShowPinNumButt->SetValue(true); m_ShowPinNumButt->SetToolTip( _("Show or hide pin numbers") ); m_OptionsBoxSizer->Add( m_ShowPinNumButt, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); m_ShowPinNameButt = new wxCheckBox( m_PanelBasic, wxID_ANY, _("Show Pin Name"), wxDefaultPosition, wxDefaultSize, 0 ); - m_ShowPinNameButt->SetValue(true); - + m_ShowPinNameButt->SetValue(true); m_ShowPinNameButt->SetToolTip( _("Show or hide pin names") ); m_OptionsBoxSizer->Add( m_ShowPinNameButt, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); m_PinsNameInsideButt = new wxCheckBox( m_PanelBasic, wxID_ANY, _("Pin Name Inside"), wxDefaultPosition, wxDefaultSize, 0 ); - m_PinsNameInsideButt->SetValue(true); - + m_PinsNameInsideButt->SetValue(true); m_PinsNameInsideButt->SetToolTip( _("Check this option to have pin names inside the body and pin number outside.\nIf not checked pins names and pins numbers are outside.") ); m_OptionsBoxSizer->Add( m_PinsNameInsideButt, 0, wxALL, 5 ); @@ -93,13 +89,11 @@ DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE( wx bSizerBasicPanel->Add( m_staticline1, 0, wxEXPAND | wxALL, 5 ); m_OptionPower = new wxCheckBox( m_PanelBasic, wxID_ANY, _("Power Symbol"), wxDefaultPosition, wxDefaultSize, 0 ); - m_OptionPower->SetToolTip( _("Check this option for power symbols.\nPower symbols have specific properties for Eeschema:\n- Value cannot be edited (to avoid mistakes) because this is the pin name that is important for a power symbol\n- Reference is updated automatically when a netlist is created (no need to run Annotate)") ); bSizerBasicPanel->Add( m_OptionPower, 0, wxALL, 5 ); m_OptionPartsLocked = new wxCheckBox( m_PanelBasic, wxID_ANY, _("Parts are locked"), wxDefaultPosition, wxDefaultSize, 0 ); - m_OptionPartsLocked->SetToolTip( _("Check this option if Eeschema cannot change parts selections inside a given package\nThis happens when parts are different in this package.\nWhen this option is not checked, Eeschema automatically choose the parts in packages to minimize packages count") ); bSizerBasicPanel->Add( m_OptionPartsLocked, 0, wxALL, 5 ); @@ -123,7 +117,7 @@ DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE( wx m_staticTextKeywords = new wxStaticText( m_PanelDoc, wxID_ANY, _("Keywords:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextKeywords->Wrap( -1 ); - m_staticTextKeywords->SetToolTip( _("Enter key words that can be used to select this composant.\nKey words cannot have spaces and are separated by a space.") ); + m_staticTextKeywords->SetToolTip( _("Enter key words that can be used to select this component.\nKey words cannot have spaces and are separated by a space.") ); m_PanelDocBoxSizer->Add( m_staticTextKeywords, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); @@ -266,4 +260,5 @@ DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::~DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE() m_ButtonDeleteAllFootprintFilter->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::DeleteAllFootprintFilter ), NULL, this ); m_sdbSizer2Cancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::OnCancelClick ), NULL, this ); m_sdbSizer2OK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::OnOkClick ), NULL, this ); + } diff --git a/eeschema/dialog_edit_component_in_lib_base.fbp b/eeschema/dialog_edit_component_in_lib_base.fbp index 8e8bf16b4b..3292427993 100644 --- a/eeschema/dialog_edit_component_in_lib_base.fbp +++ b/eeschema/dialog_edit_component_in_lib_base.fbp @@ -1,10 +1,12 @@ - + C++ 1 + source_name + 0 UTF-8 connect dialog_edit_component_in_lib_base @@ -16,13 +18,16 @@ . 1 + 1 0 0 + 1 1 + impl_virtual @@ -37,6 +42,10 @@ Lib Component Properties + + wxFILTER_NONE + wxDefaultValidator + @@ -83,6 +92,7 @@ + 1 1 @@ -97,6 +107,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -132,6 +146,7 @@ + 1 1 @@ -145,6 +160,10 @@ + + wxFILTER_NONE + wxDefaultValidator + wxSUNKEN_BORDER|wxTAB_TRAVERSAL @@ -196,6 +215,7 @@ 0 + 1 1 @@ -211,6 +231,10 @@ Check this option for components that have a De Morgan representation. This is usual for gates. + + wxFILTER_NONE + wxDefaultValidator + @@ -248,6 +272,7 @@ 1 + 1 1 @@ -263,6 +288,10 @@ Show or hide pin numbers + + wxFILTER_NONE + wxDefaultValidator + @@ -300,6 +329,7 @@ 1 + 1 1 @@ -315,6 +345,10 @@ Show or hide pin names + + wxFILTER_NONE + wxDefaultValidator + @@ -352,6 +386,7 @@ 1 + 1 1 @@ -367,6 +402,10 @@ Check this option to have pin names inside the body and pin number outside. If not checked pins names and pins numbers are outside. + + wxFILTER_NONE + wxDefaultValidator + @@ -405,6 +444,7 @@ + 1 1 @@ -419,6 +459,10 @@ wxLI_HORIZONTAL + + wxFILTER_NONE + wxDefaultValidator + @@ -472,6 +516,7 @@ + 1 1 @@ -487,6 +532,10 @@ This is the number of parts in this component package. A 74LS00 gate has 4 parts per packages. + + wxFILTER_NONE + wxDefaultValidator + @@ -523,6 +572,7 @@ + 1 1 @@ -540,6 +590,10 @@ wxSP_ARROW_KEYS + + wxFILTER_NONE + wxDefaultValidator + @@ -589,6 +643,7 @@ + 1 1 @@ -604,6 +659,10 @@ Margin (in 0.001 inches) between a pin name position and the component body. A value from 10 to 40 is usually good. + + wxFILTER_NONE + wxDefaultValidator + @@ -640,6 +699,7 @@ + 1 1 @@ -657,6 +717,10 @@ wxSP_ARROW_KEYS + + wxFILTER_NONE + wxDefaultValidator + @@ -699,6 +763,7 @@ + 1 1 @@ -713,6 +778,10 @@ wxLI_HORIZONTAL + + wxFILTER_NONE + wxDefaultValidator + @@ -749,6 +818,7 @@ 0 + 1 1 @@ -764,6 +834,10 @@ Check this option for power symbols. Power symbols have specific properties for Eeschema: - Value cannot be edited (to avoid mistakes) because this is the pin name that is important for a power symbol - Reference is updated automatically when a netlist is created (no need to run Annotate) + + wxFILTER_NONE + wxDefaultValidator + @@ -801,6 +875,7 @@ 0 + 1 1 @@ -816,6 +891,10 @@ Check this option if Eeschema cannot change parts selections inside a given package This happens when parts are different in this package. When this option is not checked, Eeschema automatically choose the parts in packages to minimize packages count + + wxFILTER_NONE + wxDefaultValidator + @@ -855,6 +934,7 @@ + 1 1 @@ -868,6 +948,10 @@ + + wxFILTER_NONE + wxDefaultValidator + wxSUNKEN_BORDER|wxTAB_TRAVERSAL @@ -906,6 +990,7 @@ + 1 1 @@ -921,6 +1006,10 @@ A short description that is displayed in Eeschema. Can be a very good help when selecting components in libraries components lists. + + wxFILTER_NONE + wxDefaultValidator + @@ -957,6 +1046,7 @@ + 1 1 @@ -972,6 +1062,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -1012,6 +1106,7 @@ + 1 1 @@ -1026,7 +1121,11 @@ - Enter key words that can be used to select this composant. Key words cannot have spaces and are separated by a space. + Enter key words that can be used to select this component. Key words cannot have spaces and are separated by a space. + + wxFILTER_NONE + wxDefaultValidator + @@ -1063,6 +1162,7 @@ + 1 1 @@ -1078,6 +1178,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -1118,6 +1222,7 @@ + 1 1 @@ -1133,6 +1238,10 @@ Enter the documentation file (a .pdf document) associated to the component. + + wxFILTER_NONE + wxDefaultValidator + @@ -1169,6 +1278,7 @@ + 1 1 @@ -1184,6 +1294,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -1233,6 +1347,7 @@ + 1 0 1 @@ -1249,6 +1364,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -1285,6 +1404,7 @@ + 1 0 1 @@ -1301,6 +1421,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -1342,6 +1466,7 @@ + 1 1 @@ -1355,6 +1480,10 @@ + + wxFILTER_NONE + wxDefaultValidator + wxSUNKEN_BORDER|wxTAB_TRAVERSAL @@ -1402,6 +1531,7 @@ + 1 1 @@ -1417,6 +1547,10 @@ An alias is a component that uses the body of its root component. It has its own documentation and keywords. A fast way to extend a library with similar components + + wxFILTER_NONE + wxDefaultValidator + @@ -1454,6 +1588,7 @@ + 1 1 @@ -1468,6 +1603,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -1516,6 +1655,7 @@ + 1 0 1 @@ -1532,6 +1672,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -1568,6 +1712,7 @@ + 1 0 1 @@ -1584,6 +1729,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -1620,6 +1769,7 @@ + 1 0 1 @@ -1636,6 +1786,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -1677,6 +1831,7 @@ + 1 1 @@ -1690,6 +1845,10 @@ + + wxFILTER_NONE + wxDefaultValidator + wxSUNKEN_BORDER|wxTAB_TRAVERSAL @@ -1737,6 +1896,7 @@ + 1 1 @@ -1752,6 +1912,10 @@ A list of footprints names that can be used for this component. Footprints names can used jockers. (like sm* to allow all footprints names starting by sm). + + wxFILTER_NONE + wxDefaultValidator + @@ -1789,6 +1953,7 @@ + 1 1 @@ -1803,6 +1968,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -1851,6 +2020,7 @@ + 1 0 1 @@ -1867,6 +2037,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -1903,6 +2077,7 @@ + 1 0 1 @@ -1919,6 +2094,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -1955,6 +2134,7 @@ + 1 0 1 @@ -1971,6 +2151,10 @@ + + wxFILTER_NONE + wxDefaultValidator + diff --git a/eeschema/dialog_edit_component_in_lib_base.h b/eeschema/dialog_edit_component_in_lib_base.h index 9759f364c8..1fff34a480 100644 --- a/eeschema/dialog_edit_component_in_lib_base.h +++ b/eeschema/dialog_edit_component_in_lib_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Apr 16 2008) +// C++ code generated with wxFormBuilder (version Sep 8 2010) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -91,19 +91,20 @@ class DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE : public wxDialog wxButton* m_sdbSizer2Cancel; // Virtual event handlers, overide them in your derived class - virtual void CopyDocToAlias( wxCommandEvent& event ){ event.Skip(); } - virtual void BrowseAndSelectDocFile( wxCommandEvent& event ){ event.Skip(); } - virtual void AddAliasOfPart( wxCommandEvent& event ){ event.Skip(); } - virtual void DeleteAliasOfPart( wxCommandEvent& event ){ event.Skip(); } - virtual void DeleteAllAliasOfPart( wxCommandEvent& event ){ event.Skip(); } - virtual void AddFootprintFilter( wxCommandEvent& event ){ event.Skip(); } - virtual void DeleteOneFootprintFilter( wxCommandEvent& event ){ event.Skip(); } - virtual void DeleteAllFootprintFilter( wxCommandEvent& event ){ event.Skip(); } - virtual void OnCancelClick( wxCommandEvent& event ){ event.Skip(); } - virtual void OnOkClick( wxCommandEvent& event ){ event.Skip(); } + virtual void CopyDocToAlias( wxCommandEvent& event ) { event.Skip(); } + virtual void BrowseAndSelectDocFile( wxCommandEvent& event ) { event.Skip(); } + virtual void AddAliasOfPart( wxCommandEvent& event ) { event.Skip(); } + virtual void DeleteAliasOfPart( wxCommandEvent& event ) { event.Skip(); } + virtual void DeleteAllAliasOfPart( wxCommandEvent& event ) { event.Skip(); } + virtual void AddFootprintFilter( wxCommandEvent& event ) { event.Skip(); } + virtual void DeleteOneFootprintFilter( wxCommandEvent& event ) { event.Skip(); } + virtual void DeleteAllFootprintFilter( wxCommandEvent& event ) { event.Skip(); } + virtual void OnCancelClick( wxCommandEvent& event ) { event.Skip(); } + virtual void OnOkClick( wxCommandEvent& event ) { event.Skip(); } public: + DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE( wxWindow* parent, wxWindowID id = ID_LIBEDIT_NOTEBOOK, const wxString& title = _("Lib Component Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 546,384 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE(); diff --git a/eeschema/eelibs_read_libraryfiles.cpp b/eeschema/eelibs_read_libraryfiles.cpp index 75870ea57e..b1de95346c 100644 --- a/eeschema/eelibs_read_libraryfiles.cpp +++ b/eeschema/eelibs_read_libraryfiles.cpp @@ -80,7 +80,7 @@ void WinEDA_SchematicFrame::LoadLibraries( void ) { wxString prompt; - prompt.Printf( _( "Component library <%s> failed to load.\n\nError: %s" ), + prompt.Printf( _( "Component library <%s> failed to load.\nError: %s" ), GetChars( fn.GetFullPath() ), GetChars( errMsg ) ); DisplayError( this, prompt ); diff --git a/eeschema/files-io.cpp b/eeschema/files-io.cpp index 47a862f799..ae5fed0842 100644 --- a/eeschema/files-io.cpp +++ b/eeschema/files-io.cpp @@ -269,7 +269,7 @@ bool WinEDA_SchematicFrame::LoadOneEEProject( const wxString& FileName, bool IsN { wxString prompt; - prompt.Printf( _( "Component library <%s> failed to load.\n\n Error: %s" ), + prompt.Printf( _( "Component library <%s> failed to load.\nError: %s" ), GetChars( fn.GetFullPath() ), GetChars( errMsg ) ); DisplayError( this, prompt ); diff --git a/gerbview/gerberframe.cpp b/gerbview/gerberframe.cpp index 09c6f288dd..0133c88f5e 100644 --- a/gerbview/gerberframe.cpp +++ b/gerbview/gerberframe.cpp @@ -508,7 +508,7 @@ void WinEDA_GerberFrame::UpdateTitleAndInfo() gerber->DisplayImageInfo( ); // Display Image Name and Layer Name (from the current gerber data): - text.Printf( _("Image name: \"%s\" Layer name \"%s\""), + text.Printf( _("Image name: \"%s\" Layer name: \"%s\""), GetChars(gerber->m_ImageName), GetChars(gerber->GetLayerParams( ).m_LayerName) ); SetStatusText( text, 0 ); diff --git a/gerbview/initpcb.cpp b/gerbview/initpcb.cpp index e0f2b807d8..0db1d5692e 100644 --- a/gerbview/initpcb.cpp +++ b/gerbview/initpcb.cpp @@ -56,7 +56,7 @@ void WinEDA_GerberFrame::Erase_Current_Layer( bool query ) int layer = getActiveLayer(); wxString msg; - msg.Printf( _( "Delete layer %d?" ), layer + 1 ); + msg.Printf( _( "Clear layer %d?" ), layer + 1 ); if( query && !IsOK( this, msg ) ) return; diff --git a/gerbview/menubar.cpp b/gerbview/menubar.cpp index dcb5718cdf..77653519c2 100644 --- a/gerbview/menubar.cpp +++ b/gerbview/menubar.cpp @@ -97,8 +97,8 @@ void WinEDA_GerberFrame::ReCreateMenuBar( void ) tools_xpm ); miscellaneous_menu->AppendSeparator(); ADD_MENUITEM_WITH_HELP( miscellaneous_menu, ID_GERBVIEW_GLOBAL_DELETE, - _( "&Delete Layer" ), - _( "Delete current layer" ), general_deletions_xpm ); + _( "&Clear Layer" ), + _( "Clear current layer" ), general_deletions_xpm ); // Menu Help: wxMenu* helpMenu = new wxMenu;