diff --git a/3d-viewer/3d_cache/sg/ifsg_api.cpp b/3d-viewer/3d_cache/sg/ifsg_api.cpp
index faab0d7a0a..0df73c1cd9 100644
--- a/3d-viewer/3d_cache/sg/ifsg_api.cpp
+++ b/3d-viewer/3d_cache/sg/ifsg_api.cpp
@@ -128,11 +128,10 @@ bool S3D::WriteVRML( const char* filename, bool overwrite, SGNODE* aTopNode,
if( op.fail() )
{
- std::ostringstream ostr;
- ostr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n";
- wxString errmsg = _( "failed to open file" );
- ostr << " * [INFO] " << errmsg.ToUTF8() << " '" << filename << "'";
- wxLogTrace( MASK_3D_SG, "%s\n", ostr.str().c_str() );
+ wxString errmsg;
+ errmsg << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n";
+ errmsg << " * [INFO] " << "failed to open file" << " '" << filename << "'";
+ wxLogTrace( MASK_3D_SG, errmsg );
return false;
}
@@ -155,13 +154,10 @@ bool S3D::WriteVRML( const char* filename, bool overwrite, SGNODE* aTopNode,
CLOSE_STREAM( op );
- do {
- std::ostringstream ostr;
- ostr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n";
- wxString errmsg = _( "problems encountered writing file" );
- ostr << " * [INFO] " << errmsg.ToUTF8() << " '" << filename << "'";
- wxLogTrace( MASK_3D_SG, "%s\n", ostr.str().c_str() );
- } while( 0 );
+ wxString errmsg;
+ errmsg << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n";
+ errmsg << " * [INFO] " << "problems encountered writing file" << " '" << filename << "'";
+ wxLogTrace( MASK_3D_SG, errmsg );
return false;
}
@@ -260,12 +256,11 @@ bool S3D::WriteCache( const char* aFileName, bool overwrite, SGNODE* aNode,
{
if( !overwrite )
{
- std::ostringstream ostr;
- ostr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n";
- wxString errmsg = _( "file exists; not overwriting" );
- ostr << " * [INFO] " << errmsg.ToUTF8() << " '";
- ostr << aFileName << "'";
- wxLogTrace( MASK_3D_SG, "%s\n", ostr.str().c_str() );
+ wxString errmsg;
+ errmsg << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n";
+ errmsg << " * [INFO] " << "file exists; not overwriting" << " '";
+ errmsg << aFileName << "'";
+ wxLogTrace( MASK_3D_SG, errmsg );
return false;
}
@@ -273,12 +268,11 @@ bool S3D::WriteCache( const char* aFileName, bool overwrite, SGNODE* aNode,
// make sure we make no attempt to write a directory
if( !wxFileName::FileExists( aFileName ) )
{
- std::ostringstream ostr;
- ostr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n";
- wxString errmsg = _( "specified path is a directory" );
- ostr << " * [INFO] " << errmsg.ToUTF8() << " '";
- ostr << aFileName << "'";
- wxLogTrace( MASK_3D_SG, "%s\n", ostr.str().c_str() );
+ wxString errmsg;
+ errmsg << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n";
+ errmsg << " * [INFO] " << "specified path is a directory" << " '";
+ errmsg << aFileName << "'";
+ wxLogTrace( MASK_3D_SG, errmsg );
return false;
}
}
@@ -287,11 +281,10 @@ bool S3D::WriteCache( const char* aFileName, bool overwrite, SGNODE* aNode,
if( output.fail() )
{
- std::ostringstream ostr;
- ostr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n";
- wxString errmsg = _( "failed to open file" );
- ostr << " * [INFO] " << errmsg.ToUTF8() << " '" << aFileName << "'";
- wxLogTrace( MASK_3D_SG, "%s\n", ostr.str().c_str() );
+ wxString errmsg;
+ errmsg << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n";
+ errmsg << " * [INFO] " << "failed to open file" << " '" << aFileName << "'";
+ wxLogTrace( MASK_3D_SG, errmsg );
return false;
}
diff --git a/eeschema/dialogs/dialog_eeschema_config_fbp.cpp b/eeschema/dialogs/dialog_eeschema_config_fbp.cpp
index 2ca3b67ddb..4d504f5875 100644
--- a/eeschema/dialogs/dialog_eeschema_config_fbp.cpp
+++ b/eeschema/dialogs/dialog_eeschema_config_fbp.cpp
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Mar 28 2015)
+// C++ code generated with wxFormBuilder (version Aug 4 2017)
// http://www.wxformbuilder.org/
//
// PLEASE DO "NOT" EDIT THIS FILE!
@@ -50,10 +50,10 @@ DIALOG_EESCHEMA_CONFIG_FBP::DIALOG_EESCHEMA_CONFIG_FBP( wxWindow* parent, wxWind
bRightSizer->Add( m_buttonRemoveLib, 0, wxALL|wxEXPAND, 5 );
- m_buttonUp = new wxButton( this, wxID_ANY, _("Up"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_buttonUp = new wxButton( this, wxID_ANY, _("Move Up"), wxDefaultPosition, wxDefaultSize, 0 );
bRightSizer->Add( m_buttonUp, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );
- m_buttonDown = new wxButton( this, wxID_ANY, _("Down"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_buttonDown = new wxButton( this, wxID_ANY, _("Move Down"), wxDefaultPosition, wxDefaultSize, 0 );
bRightSizer->Add( m_buttonDown, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );
diff --git a/eeschema/dialogs/dialog_eeschema_config_fbp.fbp b/eeschema/dialogs/dialog_eeschema_config_fbp.fbp
index 72fcc43038..868b6b1fc0 100644
--- a/eeschema/dialogs/dialog_eeschema_config_fbp.fbp
+++ b/eeschema/dialogs/dialog_eeschema_config_fbp.fbp
@@ -588,7 +588,7 @@
0
0
wxID_ANY
- Up
+ Move Up
0
@@ -676,7 +676,7 @@
0
0
wxID_ANY
- Down
+ Move Down
0
diff --git a/eeschema/dialogs/dialog_eeschema_config_fbp.h b/eeschema/dialogs/dialog_eeschema_config_fbp.h
index 66ea427128..c56d78caf0 100644
--- a/eeschema/dialogs/dialog_eeschema_config_fbp.h
+++ b/eeschema/dialogs/dialog_eeschema_config_fbp.h
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Mar 28 2015)
+// C++ code generated with wxFormBuilder (version Aug 4 2017)
// http://www.wxformbuilder.org/
//
// PLEASE DO "NOT" EDIT THIS FILE!