Modify a few messages to make translations more easy.

This commit is contained in:
jean-pierre charras 2017-10-11 14:14:16 +02:00
parent afd2d4f016
commit e0b9a21417
4 changed files with 28 additions and 35 deletions

View File

@ -128,11 +128,10 @@ bool S3D::WriteVRML( const char* filename, bool overwrite, SGNODE* aTopNode,
if( op.fail() ) if( op.fail() )
{ {
std::ostringstream ostr; wxString errmsg;
ostr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n"; errmsg << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n";
wxString errmsg = _( "failed to open file" ); errmsg << " * [INFO] " << "failed to open file" << " '" << filename << "'";
ostr << " * [INFO] " << errmsg.ToUTF8() << " '" << filename << "'"; wxLogTrace( MASK_3D_SG, errmsg );
wxLogTrace( MASK_3D_SG, "%s\n", ostr.str().c_str() );
return false; return false;
} }
@ -155,13 +154,10 @@ bool S3D::WriteVRML( const char* filename, bool overwrite, SGNODE* aTopNode,
CLOSE_STREAM( op ); CLOSE_STREAM( op );
do { wxString errmsg;
std::ostringstream ostr; errmsg << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n";
ostr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n"; errmsg << " * [INFO] " << "problems encountered writing file" << " '" << filename << "'";
wxString errmsg = _( "problems encountered writing file" ); wxLogTrace( MASK_3D_SG, errmsg );
ostr << " * [INFO] " << errmsg.ToUTF8() << " '" << filename << "'";
wxLogTrace( MASK_3D_SG, "%s\n", ostr.str().c_str() );
} while( 0 );
return false; return false;
} }
@ -260,12 +256,11 @@ bool S3D::WriteCache( const char* aFileName, bool overwrite, SGNODE* aNode,
{ {
if( !overwrite ) if( !overwrite )
{ {
std::ostringstream ostr; wxString errmsg;
ostr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n"; errmsg << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n";
wxString errmsg = _( "file exists; not overwriting" ); errmsg << " * [INFO] " << "file exists; not overwriting" << " '";
ostr << " * [INFO] " << errmsg.ToUTF8() << " '"; errmsg << aFileName << "'";
ostr << aFileName << "'"; wxLogTrace( MASK_3D_SG, errmsg );
wxLogTrace( MASK_3D_SG, "%s\n", ostr.str().c_str() );
return false; 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 // make sure we make no attempt to write a directory
if( !wxFileName::FileExists( aFileName ) ) if( !wxFileName::FileExists( aFileName ) )
{ {
std::ostringstream ostr; wxString errmsg;
ostr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n"; errmsg << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n";
wxString errmsg = _( "specified path is a directory" ); errmsg << " * [INFO] " << "specified path is a directory" << " '";
ostr << " * [INFO] " << errmsg.ToUTF8() << " '"; errmsg << aFileName << "'";
ostr << aFileName << "'"; wxLogTrace( MASK_3D_SG, errmsg );
wxLogTrace( MASK_3D_SG, "%s\n", ostr.str().c_str() );
return false; return false;
} }
} }
@ -287,11 +281,10 @@ bool S3D::WriteCache( const char* aFileName, bool overwrite, SGNODE* aNode,
if( output.fail() ) if( output.fail() )
{ {
std::ostringstream ostr; wxString errmsg;
ostr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n"; errmsg << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n";
wxString errmsg = _( "failed to open file" ); errmsg << " * [INFO] " << "failed to open file" << " '" << aFileName << "'";
ostr << " * [INFO] " << errmsg.ToUTF8() << " '" << aFileName << "'"; wxLogTrace( MASK_3D_SG, errmsg );
wxLogTrace( MASK_3D_SG, "%s\n", ostr.str().c_str() );
return false; return false;
} }

View File

@ -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/ // http://www.wxformbuilder.org/
// //
// PLEASE DO "NOT" EDIT THIS FILE! // 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 ); 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 ); 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 ); bRightSizer->Add( m_buttonDown, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );

View File

@ -588,7 +588,7 @@
<property name="gripper">0</property> <property name="gripper">0</property>
<property name="hidden">0</property> <property name="hidden">0</property>
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="label">Up</property> <property name="label">Move Up</property>
<property name="max_size"></property> <property name="max_size"></property>
<property name="maximize_button">0</property> <property name="maximize_button">0</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>
@ -676,7 +676,7 @@
<property name="gripper">0</property> <property name="gripper">0</property>
<property name="hidden">0</property> <property name="hidden">0</property>
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="label">Down</property> <property name="label">Move Down</property>
<property name="max_size"></property> <property name="max_size"></property>
<property name="maximize_button">0</property> <property name="maximize_button">0</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>

View File

@ -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/ // http://www.wxformbuilder.org/
// //
// PLEASE DO "NOT" EDIT THIS FILE! // PLEASE DO "NOT" EDIT THIS FILE!