Commit 40c5a46f authored by jean-pierre charras's avatar jean-pierre charras

Libedit: fix Bug #994014.

Pcbnew: fix Pcbnew name capitalization in messages.
About dialog: add a link to kicad-pcb.org
parent 9f41cac0
...@@ -147,8 +147,8 @@ static void InitKiCadAboutNew( AboutAppInfo& info ) ...@@ -147,8 +147,8 @@ static void InitKiCadAboutNew( AboutAppInfo& info )
HtmlHyperlink( wxT( "https://launchpad.net/kicad" ), _( "Project on Launchpad" ) ) << wxT( HtmlHyperlink( wxT( "https://launchpad.net/kicad" ), _( "Project on Launchpad" ) ) << wxT(
"</li>" ); "</li>" );
description << wxT( "<li>" ) << description << wxT( "<li>" ) <<
HtmlHyperlink( wxT( "http://kicad.sourceforge.net" ), HtmlHyperlink( wxT( "http://www.kicad-pcb.org" ),
_( "Wiki on Sourceforge with many information" ) ) << wxT( "</li>" ); _( "The new KiCad site" ) ) << wxT( "</li>" );
description << wxT( "<li>" ) << description << wxT( "<li>" ) <<
HtmlHyperlink( wxT( "http://www.kicadlib.org" ), HtmlHyperlink( wxT( "http://www.kicadlib.org" ),
_( "Repository with additional component libraries" ) ) << wxT( "</li>" ); _( "Repository with additional component libraries" ) ) << wxT( "</li>" );
......
...@@ -271,7 +271,8 @@ void LIB_EDIT_FRAME::HandleBlockPlace( wxDC* DC ) ...@@ -271,7 +271,8 @@ void LIB_EDIT_FRAME::HandleBlockPlace( wxDC* DC )
SaveCopyInUndoList( m_component ); SaveCopyInUndoList( m_component );
pt = GetScreen()->m_BlockLocate.Centre(); pt = GetScreen()->m_BlockLocate.Centre();
pt.y *= -1; pt = GetScreen()->GetNearestGridPosition( pt );
NEGATE( pt.y );
if ( m_component ) if ( m_component )
{ {
......
/** /**
* @file pcbnew/hotkeys.h * @file pcbnew/hotkeys.h
* PCBNew hotkeys * Pcbnew hotkeys
*/ */
#ifndef _PCBNEW_KOTKEYS_H #ifndef _PCBNEW_KOTKEYS_H
#define _PCBNEW_HOTKEYS_H #define _PCBNEW_HOTKEYS_H
......
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
#include <wx/ffile.h> #include <wx/ffile.h>
#define VERSION_ERROR_FORMAT _( "File '%s' is format version: %d.\nI only support format version <= %d.\nPlease upgrade PCBNew to load this file." ) #define VERSION_ERROR_FORMAT _( "File '%s' is format version: %d.\nI only support format version <= %d.\nPlease upgrade Pcbnew to load this file." )
#define UNKNOWN_GRAPHIC_FORMAT _( "unknown graphic type: %d") #define UNKNOWN_GRAPHIC_FORMAT _( "unknown graphic type: %d")
#define UNKNOWN_PAD_FORMAT _( "unknown pad type: %d") #define UNKNOWN_PAD_FORMAT _( "unknown pad type: %d")
#define UNKNOWN_PAD_ATTRIBUTE _( "unknown pad attribute: %d" ) #define UNKNOWN_PAD_ATTRIBUTE _( "unknown pad attribute: %d" )
...@@ -324,7 +324,7 @@ void LEGACY_PLUGIN::checkVersion() ...@@ -324,7 +324,7 @@ void LEGACY_PLUGIN::checkVersion()
#if !defined(DEBUG) #if !defined(DEBUG)
if( ver > LEGACY_BOARD_FILE_VERSION ) if( ver > LEGACY_BOARD_FILE_VERSION )
{ {
// "File '%s' is format version: %d.\nI only support format version <= %d.\nPlease upgrade PCBNew to load this file." // "File '%s' is format version: %d.\nI only support format version <= %d.\nPlease upgrade Pcbnew to load this file."
m_error.Printf( VERSION_ERROR_FORMAT, m_error.Printf( VERSION_ERROR_FORMAT,
m_reader->GetSource().GetData(), ver, LEGACY_BOARD_FILE_VERSION ); m_reader->GetSource().GetData(), ver, LEGACY_BOARD_FILE_VERSION );
THROW_IO_ERROR( m_error ); THROW_IO_ERROR( m_error );
...@@ -358,7 +358,7 @@ void LEGACY_PLUGIN::loadGENERAL() ...@@ -358,7 +358,7 @@ void LEGACY_PLUGIN::loadGENERAL()
diskToBiu = 10000/25.4; diskToBiu = 10000/25.4;
#else #else
THROW_IO_ERROR( _( "May not load millimeter *.brd file into 'PCBNew compiled for deci-mils'" ) ); THROW_IO_ERROR( _( "May not load millimeter *.brd file into 'Pcbnew compiled for deci-mils'" ) );
#endif #endif
} }
} }
...@@ -3844,7 +3844,7 @@ void FPL_CACHE::ReadAndVerifyHeader( LINE_READER* aReader ) ...@@ -3844,7 +3844,7 @@ void FPL_CACHE::ReadAndVerifyHeader( LINE_READER* aReader )
m_owner->diskToBiu = 10000/25.4; m_owner->diskToBiu = 10000/25.4;
#else #else
THROW_IO_ERROR( _( "May not load millimeter legacy library file into 'PCBNew compiled for deci-mils'" ) ); THROW_IO_ERROR( _( "May not load millimeter legacy library file into 'Pcbnew compiled for deci-mils'" ) );
#endif #endif
} }
......
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