minor updates (8d8bdc3e) · Commits · Elphel / kicad-source-mirror

eeschema/class_libentry.cpp

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -704,7 +704,7 @@ bool LIB_COMPONENT::LoadDrawEntries( FILE* f, char* line,
	{		{
	if( GetLine( f, line, lineNum, 1024 ) == NULL )		if( GetLine( f, line, lineNum, 1024 ) == NULL )
	{		{
	errorMsg = _( "file ended prematurely loading component draw element" );		errorMsg = wxT( "file ended prematurely loading component draw element" );
	return false;		return false;
	}		}

	@@ -759,7 +759,7 @@ bool LIB_COMPONENT::LoadDrawEntries( FILE* f, char* line,
	{		{
	if( GetLine( f, line, lineNum, 1024 ) == NULL )		if( GetLine( f, line, lineNum, 1024 ) == NULL )
	{		{
	errorMsg = _( "file ended prematurely while attempting \		errorMsg = wxT( "file ended prematurely while attempting \
	to flush to end of drawing section." );		to flush to end of drawing section." );
	return false;		return false;
	}		}

eeschema/class_library.cpp

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -516,14 +516,14 @@ bool CMP_LIBRARY::Load( wxString& errMsg )

	if( !tkn.HasMoreTokens() )		if( !tkn.HasMoreTokens() )
	{		{
	errMsg = _( "The file header is missing version and time stamp \		errMsg = wxT(
	information." );		"The file header is missing version and time stamp information." );
	return false;		return false;
	}		}

	if( tkn.GetNextToken() != wxT( "Version" ) \|\| !tkn.HasMoreTokens() )		if( tkn.GetNextToken() != wxT( "Version" ) \|\| !tkn.HasMoreTokens() )
	{		{
	errMsg = _( "The file header version information is invalid." );		errMsg = wxT( "The file header version information is invalid." );
	return false;		return false;
	}		}

gerbview/files.cpp

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -38,7 +38,7 @@ void WinEDA_GerberFrame::Files_io( wxCommandEvent& event )
	switch( id )		switch( id )
	{		{
	case ID_LOAD_FILE:		case ID_LOAD_FILE:
	if( Clear_Pcb( TRUE ) )		if( Clear_Pcb( true ) )
	{		{
	LoadOneGerberFile( wxEmptyString, 0 );		LoadOneGerberFile( wxEmptyString, 0 );
	}		}
	@@ -63,8 +63,8 @@ void WinEDA_GerberFrame::Files_io( wxCommandEvent& event )
	break;		break;

	case ID_NEW_BOARD:		case ID_NEW_BOARD:
	Clear_Pcb( TRUE );		Clear_Pcb( true );
	Zoom_Automatique( FALSE );		Zoom_Automatique( false );
	GetScreen()->SetRefreshReq();		GetScreen()->SetRefreshReq();
	break;		break;

	@@ -155,7 +155,7 @@ bool WinEDA_GerberFrame::LoadOneGerberFile( const wxString& FullFileName,
	if( Read_GERBER_File( GetScreen()->m_FileName, filename.GetFullPath() ) )		if( Read_GERBER_File( GetScreen()->m_FileName, filename.GetFullPath() ) )
	SetLastProject( GetScreen()->m_FileName );		SetLastProject( GetScreen()->m_FileName );

	Zoom_Automatique( FALSE );		Zoom_Automatique( false );
	GetScreen()->SetRefreshReq();		GetScreen()->SetRefreshReq();
	g_SaveTime = time( NULL );		g_SaveTime = time( NULL );

gerbview/tool_gerber.cpp

+6 −6

Original line number	Original line	Diff line number	Diff line
	@@ -25,12 +25,12 @@ void WinEDA_GerberFrame::ReCreateMenuBar( void )
	menuBar = new wxMenuBar();		menuBar = new wxMenuBar();

	wxMenu* filesMenu = new wxMenu;		wxMenu* filesMenu = new wxMenu;
	filesMenu->Append( ID_LOAD_FILE, _( "Clear and Load Gerber File" ),		filesMenu->Append( ID_LOAD_FILE, _( "Clear All and Load Gerber File" ),
	_( "Clear all layers and Load new Gerber file" ),		_( "Clear all layers and Load a new Gerber file on first layer" ),
	FALSE );		FALSE );

	filesMenu->Append( ID_APPEND_FILE, _( "Load Gerber File" ),		filesMenu->Append( ID_APPEND_FILE, _( "Append Gerber File to Current Layer" ),
	_( "Load new Gerber file on current layer" ),		_( "Append a new Gerber file to the current layer" ),
	FALSE );		FALSE );

	filesMenu->Append( ID_MENU_INC_LAYER_AND_APPEND_FILE,		filesMenu->Append( ID_MENU_INC_LAYER_AND_APPEND_FILE,
	@@ -41,11 +41,11 @@ 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 EXCELLON Drill File" ),
	_( "Load excellon drill file" ), FALSE );		_( "Load excellon drill file" ), FALSE );
	#endif		#endif

	filesMenu->Append( ID_NEW_BOARD, _( "&New" ),		filesMenu->Append( ID_NEW_BOARD, _( "&Clear All" ),
	_( "Clear all layers" ), FALSE );		_( "Clear all layers" ), FALSE );

	filesMenu->AppendSeparator();		filesMenu->AppendSeparator();

internat/fr/kicad.mo

+1.45 KiB (203 KiB)

File changed.

No diff preview for this file type.

View original file

View changed file

Admin message