diff --git a/cvpcb/cvpcb.cpp b/cvpcb/cvpcb.cpp
index 617dd4c43a..1b8d5055eb 100644
--- a/cvpcb/cvpcb.cpp
+++ b/cvpcb/cvpcb.cpp
@@ -196,7 +196,7 @@ bool IFACE::OnKifaceStart( PGM_BASE* aProgram, int aCtlBits )
 
         if( !FP_LIB_TABLE::LoadGlobalTable( GFootprintTable ) )
         {
-            DisplayInfoMessage( NULL, wxT(
+            DisplayInfoMessage( NULL, _(
                 "You have run CvPcb for the first time using the "
                 "new footprint library table method for finding "
                 "footprints.  CvPcb has either copied the default "
diff --git a/cvpcb/readwrite_dlgs.cpp b/cvpcb/readwrite_dlgs.cpp
index c23d8a0a6b..f70fd2debd 100644
--- a/cvpcb/readwrite_dlgs.cpp
+++ b/cvpcb/readwrite_dlgs.cpp
@@ -247,9 +247,9 @@ bool CVPCB_MAINFRAME::ReadNetListAndLinkFiles()
             {
                 wxString msg = ioe.errorText;
                 msg += wxT( "\n\n" );
-                msg += _( "First check your fp-lib-table entries." );
+                msg += _( "First check your footprint library table entries." );
 
-                wxMessageBox( msg, wxT( "Problematic fp-lib-tables" ) );
+                wxMessageBox( msg, _( "Problematic Footprint Library Tables" ) );
                 return false;
             }
 
@@ -257,12 +257,12 @@ bool CVPCB_MAINFRAME::ReadNetListAndLinkFiles()
             {
                 HTML_MESSAGE_BOX dlg( this, wxEmptyString );
 
-                dlg.MessageSet( wxT( "The following errors occurred attempting to convert the "
-                                     "footprint assignments:\n\n" ) );
+                dlg.MessageSet( _( "The following errors occurred attempting to convert the "
+                                   "footprint assignments:\n\n" ) );
                 dlg.ListSet( msg );
-                dlg.MessageSet( wxT( "\nYou will need to reassign them manually if you want them "
-                                     "to be updated correctly the next time you import the "
-                                     "netlist in Pcbnew." ) );
+                dlg.MessageSet( _( "\nYou will need to reassign them manually if you want them "
+                                   "to be updated correctly the next time you import the "
+                                   "netlist in Pcbnew." ) );
 
 #if 1
                 dlg.ShowModal();
@@ -398,8 +398,8 @@ int CVPCB_MAINFRAME::SaveCmpLinkFile( const wxString& aFullFileName )
     if( !IsWritable( fn.GetFullPath() ) || WriteComponentLinkFile( fn.GetFullPath() ) == 0 )
     {
         DisplayError( this,
-            wxString::Format( _( "Unable to create component footprint link file '%s'" ),
-                             fn.GetFullPath() ) );
+                      wxString::Format( _( "Unable to create component footprint link file '%s'" ),
+                                        fn.GetFullPath() ) );
         return 0;
     }