diff --git a/pcbnew/altium2kicadpcb_plugin/altium_pcb.cpp b/pcbnew/altium2kicadpcb_plugin/altium_pcb.cpp index 5b1924eab1..415582abb8 100644 --- a/pcbnew/altium2kicadpcb_plugin/altium_pcb.cpp +++ b/pcbnew/altium2kicadpcb_plugin/altium_pcb.cpp @@ -412,7 +412,7 @@ int ALTIUM_PCB::GetNetCode( uint16_t aId ) const else if( m_num_nets < aId ) { THROW_IO_ERROR( - wxString::Format( _( "Netcode with id %d does not exist. Only %d nets are known" ), + wxString::Format( "Netcode with id %d does not exist. Only %d nets are known", aId, m_num_nets ) ); } else diff --git a/plugins/ldr/3d/pluginldr3D.cpp b/plugins/ldr/3d/pluginldr3D.cpp index c46f0f7c48..33c0451380 100644 --- a/plugins/ldr/3d/pluginldr3D.cpp +++ b/plugins/ldr/3d/pluginldr3D.cpp @@ -101,7 +101,7 @@ bool KICAD_PLUGIN_LDR_3D::Open( const wxString& aFullFileName ) { std::ostringstream ostr; ostr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n"; - wxString errmsg = _( "incompatible plugin (missing function 'GetNExtensions')" ); + wxString errmsg = "incompatible plugin (missing function 'GetNExtensions')"; ostr << errmsg.ToUTF8() << "\n"; ostr << "'" << aFullFileName.ToUTF8() << "'"; wxLogTrace( MASK_PLUGINLDR, "%s\n", ostr.str().c_str() ); @@ -114,7 +114,7 @@ bool KICAD_PLUGIN_LDR_3D::Open( const wxString& aFullFileName ) { std::ostringstream ostr; ostr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n"; - wxString errmsg = _( "incompatible plugin (missing function 'GetModelExtension')" ); + wxString errmsg = "incompatible plugin (missing function 'GetModelExtension')"; ostr << errmsg.ToUTF8() << "\n"; ostr << "'" << aFullFileName.ToUTF8() << "'"; wxLogTrace( MASK_PLUGINLDR, "%s\n", ostr.str().c_str() ); @@ -123,7 +123,7 @@ bool KICAD_PLUGIN_LDR_3D::Open( const wxString& aFullFileName ) else { std::ostringstream ostr; - wxString errmsg = _( "missing function 'GetModelExtension'" ); + wxString errmsg = "missing function 'GetModelExtension'"; ostr << errmsg.ToUTF8(); wxLogTrace( MASK_PLUGINLDR, "%s\n", ostr.str().c_str() ); } @@ -135,7 +135,7 @@ bool KICAD_PLUGIN_LDR_3D::Open( const wxString& aFullFileName ) { std::ostringstream ostr; ostr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n"; - wxString errmsg = _( "incompatible plugin (missing function 'GetNFilters')" ); + wxString errmsg = "incompatible plugin (missing function 'GetNFilters')"; ostr << errmsg.ToUTF8() << "\n"; ostr << "'" << aFullFileName.ToUTF8() << "'"; wxLogTrace( MASK_PLUGINLDR, "%s\n", ostr.str().c_str() ); @@ -144,7 +144,7 @@ bool KICAD_PLUGIN_LDR_3D::Open( const wxString& aFullFileName ) else { std::ostringstream ostr; - wxString errmsg = _( "missing function 'GetNFilters'" ); + wxString errmsg = "missing function 'GetNFilters'"; ostr << errmsg.ToUTF8(); wxLogTrace( MASK_PLUGINLDR, "%s\n", ostr.str().c_str() ); } @@ -156,7 +156,7 @@ bool KICAD_PLUGIN_LDR_3D::Open( const wxString& aFullFileName ) { std::ostringstream ostr; ostr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n"; - wxString errmsg = _( "incompatible plugin (missing function 'GetFileFilter')" ); + wxString errmsg = "incompatible plugin (missing function 'GetFileFilter')"; ostr << errmsg.ToUTF8() << "\n"; ostr << "'" << aFullFileName.ToUTF8() << "'"; wxLogTrace( MASK_PLUGINLDR, "%s\n", ostr.str().c_str() ); @@ -165,7 +165,7 @@ bool KICAD_PLUGIN_LDR_3D::Open( const wxString& aFullFileName ) else { std::ostringstream ostr; - wxString errmsg = _( "missing function 'GetFileFilter'" ); + wxString errmsg = "missing function 'GetFileFilter'"; ostr << errmsg.ToUTF8(); wxLogTrace( MASK_PLUGINLDR, "%s\n", ostr.str().c_str() ); } @@ -177,7 +177,7 @@ bool KICAD_PLUGIN_LDR_3D::Open( const wxString& aFullFileName ) { std::ostringstream ostr; ostr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n"; - wxString errmsg = _( "incompatible plugin (missing function 'CanRender')" ); + wxString errmsg = "incompatible plugin (missing function 'CanRender')"; ostr << errmsg.ToUTF8() << "\n"; ostr << "'" << aFullFileName.ToUTF8() << "'"; wxLogTrace( MASK_PLUGINLDR, "%s\n", ostr.str().c_str() ); @@ -186,7 +186,7 @@ bool KICAD_PLUGIN_LDR_3D::Open( const wxString& aFullFileName ) else { std::ostringstream ostr; - wxString errmsg = _( "missing function 'CanRender'" ); + wxString errmsg = "missing function 'CanRender'"; ostr << errmsg.ToUTF8(); wxLogTrace( MASK_PLUGINLDR, "%s\n", ostr.str().c_str() ); } @@ -198,7 +198,7 @@ bool KICAD_PLUGIN_LDR_3D::Open( const wxString& aFullFileName ) { std::ostringstream ostr; ostr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n"; - wxString errmsg = _( "incompatible plugin (missing function 'Load')" ); + wxString errmsg = "incompatible plugin (missing function 'Load')"; ostr << errmsg.ToUTF8() << "\n"; ostr << "'" << aFullFileName.ToUTF8() << "'"; wxLogTrace( MASK_PLUGINLDR, "%s\n", ostr.str().c_str() ); @@ -206,7 +206,7 @@ bool KICAD_PLUGIN_LDR_3D::Open( const wxString& aFullFileName ) else { std::ostringstream ostr; - wxString errmsg = _( "missing function 'Load'" ); + wxString errmsg = "missing function 'Load'"; ostr << errmsg.ToUTF8(); wxLogTrace( MASK_PLUGINLDR, "%s\n", ostr.str().c_str() ); } diff --git a/plugins/ldr/pluginldr.cpp b/plugins/ldr/pluginldr.cpp index be68a579f5..0328501a33 100644 --- a/plugins/ldr/pluginldr.cpp +++ b/plugins/ldr/pluginldr.cpp @@ -89,7 +89,7 @@ bool KICAD_PLUGIN_LDR::open( const wxString& aFullFileName, const char* aPluginC { std::ostringstream ostr; ostr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n"; - wxString errmsg = _( "incompatible plugin (missing function 'GetKicadPluginClass')" ); + wxString errmsg = "incompatible plugin (missing function 'GetKicadPluginClass')"; ostr << errmsg.ToUTF8() << "\n"; ostr << "'" << aFullFileName.ToUTF8() << "'"; wxLogTrace( MASK_PLUGINLDR, "%s\n", ostr.str().c_str() ); @@ -102,7 +102,7 @@ bool KICAD_PLUGIN_LDR::open( const wxString& aFullFileName, const char* aPluginC { std::ostringstream ostr; ostr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n"; - wxString errmsg = _( "incompatible plugin (missing function 'GetClassVersion')" ); + wxString errmsg = "incompatible plugin (missing function 'GetClassVersion')"; ostr << errmsg.ToUTF8() << "\n"; ostr << "'" << aFullFileName.ToUTF8() << "'"; wxLogTrace( MASK_PLUGINLDR, "%s\n", ostr.str().c_str() ); @@ -111,7 +111,7 @@ bool KICAD_PLUGIN_LDR::open( const wxString& aFullFileName, const char* aPluginC else { std::ostringstream ostr; - wxString errmsg = _( "missing function 'GetClassVersion'" ); + wxString errmsg = "missing function 'GetClassVersion'"; ostr << errmsg.ToUTF8(); wxLogTrace( MASK_PLUGINLDR, "%s\n", ostr.str().c_str() ); } @@ -123,7 +123,7 @@ bool KICAD_PLUGIN_LDR::open( const wxString& aFullFileName, const char* aPluginC { std::ostringstream ostr; ostr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n"; - wxString errmsg = _( "incompatible plugin (missing function 'CheckClassVersion')" ); + wxString errmsg = "incompatible plugin (missing function 'CheckClassVersion')"; ostr << errmsg.ToUTF8() << "\n"; ostr << "'" << aFullFileName.ToUTF8() << "'"; wxLogTrace( MASK_PLUGINLDR, "%s\n", ostr.str().c_str() ); @@ -132,7 +132,7 @@ bool KICAD_PLUGIN_LDR::open( const wxString& aFullFileName, const char* aPluginC else { std::ostringstream ostr; - wxString errmsg = _( "missing function 'CheckClassVersion'" ); + wxString errmsg = "missing function 'CheckClassVersion'"; ostr << errmsg.ToUTF8(); wxLogTrace( MASK_PLUGINLDR, "%s\n", ostr.str().c_str() ); } @@ -144,7 +144,7 @@ bool KICAD_PLUGIN_LDR::open( const wxString& aFullFileName, const char* aPluginC { std::ostringstream ostr; ostr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n"; - wxString errmsg = _( "incompatible plugin (missing function 'GetKicadPluginName')" ); + wxString errmsg = "incompatible plugin (missing function 'GetKicadPluginName')"; ostr << errmsg.ToUTF8() << "\n"; ostr << "'" << aFullFileName.ToUTF8() << "'"; wxLogTrace( MASK_PLUGINLDR, "%s\n", ostr.str().c_str() ); @@ -153,7 +153,7 @@ bool KICAD_PLUGIN_LDR::open( const wxString& aFullFileName, const char* aPluginC else { std::ostringstream ostr; - wxString errmsg = _( "missing function 'GetKicadPluginName'" ); + wxString errmsg = "missing function 'GetKicadPluginName'"; ostr << errmsg.ToUTF8(); wxLogTrace( MASK_PLUGINLDR, "%s\n", ostr.str().c_str() ); } @@ -165,7 +165,7 @@ bool KICAD_PLUGIN_LDR::open( const wxString& aFullFileName, const char* aPluginC { std::ostringstream ostr; ostr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n"; - wxString errmsg = _( "incompatible plugin (missing function 'GetVersion')" ); + wxString errmsg = "incompatible plugin (missing function 'GetVersion')"; ostr << errmsg.ToUTF8() << "\n"; ostr << "'" << aFullFileName.ToUTF8() << "'"; wxLogTrace( MASK_PLUGINLDR, "%s\n", ostr.str().c_str() ); @@ -173,7 +173,7 @@ bool KICAD_PLUGIN_LDR::open( const wxString& aFullFileName, const char* aPluginC else { std::ostringstream ostr; - wxString errmsg = _( "missing function 'GetVersion'" ); + wxString errmsg = "missing function 'GetVersion'"; ostr << errmsg.ToUTF8() << "\n"; wxLogTrace( MASK_PLUGINLDR, "%s\n", ostr.str().c_str() ); }