wxLOCALE_LOAD_DEFAULT patch from Martijn Kuipers.

common/edaappl.cpp

@@ -666,10 +666,9 @@ bool WinEDA_App::SetLanguage( bool first_time )
         delete m_Locale;
     m_Locale = new wxLocale;
 
-    if( !m_Locale->Init( m_LanguageId, wxLOCALE_CONV_ENCODING ) )
+    if( !m_Locale->Init( m_LanguageId ) )
     {
-        wxLogDebug( wxT( "Failed to initialize " ) +
-                    wxLocale::GetLanguageInfo( m_LanguageId )->Description );
+        wxLogDebug( wxT("This language is not supported by the system.") );
 
         m_LanguageId = wxLANGUAGE_DEFAULT;
         delete m_Locale;

pcbnew/editrack.cpp

@@ -720,7 +720,8 @@ void ShowNewTrackWhenMovingCursor( WinEDA_DrawPanel* panel,
 
     // Set track parameters, that can be modified while creating the track
     g_CurrentTrackSegment->SetLayer( screen->m_Active_Layer );
-    g_CurrentTrackSegment->m_Width = frame->GetBoard()->GetCurrentTrackWidth();
+    if( !frame->GetBoard()->GetBoardDesignSettings()->m_UseConnectedTrackWidth )
+        g_CurrentTrackSegment->m_Width = frame->GetBoard()->GetCurrentTrackWidth();
 
     if( g_TwoSegmentTrackBuild )
     {