diff --git a/bitmap2component/bitmap2cmp_gui.cpp b/bitmap2component/bitmap2cmp_gui.cpp
index 72eb389ee0..19969b16d6 100644
--- a/bitmap2component/bitmap2cmp_gui.cpp
+++ b/bitmap2component/bitmap2cmp_gui.cpp
@@ -639,7 +639,7 @@ void BM2CMP_FRAME::ExportFile( FILE* aOutfile, OUTPUT_FMT_ID aFormat )
     if( !potrace_bitmap )
     {
         wxString msg;
-        msg.Printf( wxT( "Error allocating memory for potrace bitmap" ) );
+        msg.Printf( _( "Error allocating memory for potrace bitmap" ) );
         wxMessageBox( msg );
         return;
     }
diff --git a/common/base_screen.cpp b/common/base_screen.cpp
index ba9c3e70e2..e706693135 100644
--- a/common/base_screen.cpp
+++ b/common/base_screen.cpp
@@ -245,8 +245,8 @@ int BASE_SCREEN::SetGrid( const wxRealPoint& size )
 
     m_Grid = nearest_grid;
 
-    wxLogWarning( wxT( "Grid size( %f, %f ) not in grid list, falling back " ) \
-                  wxT( "to grid size( %f, %f )." ),
+    wxLogWarning( _( "Grid size( %f, %f ) not in grid list, falling back "
+                     "to grid size( %f, %f )." ),
                   size.x, size.y, m_Grid.m_Size.x, m_Grid.m_Size.y );
 
     return gridIdx;
@@ -268,8 +268,8 @@ int BASE_SCREEN::SetGrid( int aCommandId  )
 
     m_Grid = m_grids[0];
 
-    wxLogWarning( wxT( "Grid ID %d not in grid list, falling back to " ) \
-                  wxT( "grid size( %g, %g )." ), aCommandId,
+    wxLogWarning( _( "Grid ID %d not in grid list, falling back to "
+                     "grid size( %g, %g )." ), aCommandId,
                   m_Grid.m_Size.x, m_Grid.m_Size.y );
 
     return m_grids[0].m_CmdId - ID_POPUP_GRID_LEVEL_1000;
diff --git a/common/dialogs/dialog_page_settings.cpp b/common/dialogs/dialog_page_settings.cpp
index a632a6b53d..305da6f6b3 100644
--- a/common/dialogs/dialog_page_settings.cpp
+++ b/common/dialogs/dialog_page_settings.cpp
@@ -529,7 +529,7 @@ bool DIALOG_PAGES_SETTINGS::SavePageSettings()
 
     if( !retSuccess )
     {
-        wxASSERT_MSG( false, wxT( "the translation for paper size must preserve original spellings" ) );
+        wxASSERT_MSG( false, _( "the translation for paper size must preserve original spellings" ) );
         m_pageInfo.SetType( PAGE_INFO::A4 );
     }
 
diff --git a/cvpcb/dialogs/fp_conflict_assignment_selector_base.cpp b/cvpcb/dialogs/fp_conflict_assignment_selector_base.cpp
index d93f98b080..3066281bc4 100644
--- a/cvpcb/dialogs/fp_conflict_assignment_selector_base.cpp
+++ b/cvpcb/dialogs/fp_conflict_assignment_selector_base.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Nov 22 2017)
+// C++ code generated with wxFormBuilder (version Apr 19 2018)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -16,7 +16,7 @@ DIALOG_FP_CONFLICT_ASSIGNMENT_SELECTOR_BASE::DIALOG_FP_CONFLICT_ASSIGNMENT_SELEC
 	wxBoxSizer* bSizerMain;
 	bSizerMain = new wxBoxSizer( wxVERTICAL );
 	
-	m_staticTextInfo = new wxStaticText( this, wxID_ANY, wxT("Footprint assignments from schematic netlist and symbol footprint association file (.cmp) are conflicting.\n\nPlease choose the assignment."), wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT );
+	m_staticTextInfo = new wxStaticText( this, wxID_ANY, _("Footprint assignments from schematic netlist and symbol footprint association file (.cmp) are conflicting.\n\nPlease choose the assignment."), wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT );
 	m_staticTextInfo->Wrap( -1 );
 	bSizerMain->Add( m_staticTextInfo, 0, wxALL|wxEXPAND, 5 );
 	
diff --git a/cvpcb/dialogs/fp_conflict_assignment_selector_base.fbp b/cvpcb/dialogs/fp_conflict_assignment_selector_base.fbp
index 4f38d8a5ad..54a57d7b14 100644
--- a/cvpcb/dialogs/fp_conflict_assignment_selector_base.fbp
+++ b/cvpcb/dialogs/fp_conflict_assignment_selector_base.fbp
@@ -14,7 +14,8 @@
         <property name="file">fp_conflict_assignment_selector_base</property>
         <property name="first_id">1000</property>
         <property name="help_provider">none</property>
-        <property name="internationalize">0</property>
+        <property name="indent_with_spaces"></property>
+        <property name="internationalize">1</property>
         <property name="name">fp_conflict_assignment_selector</property>
         <property name="namespace"></property>
         <property name="path">.</property>
diff --git a/cvpcb/dialogs/fp_conflict_assignment_selector_base.h b/cvpcb/dialogs/fp_conflict_assignment_selector_base.h
index 05636e1ff4..0a87786509 100644
--- a/cvpcb/dialogs/fp_conflict_assignment_selector_base.h
+++ b/cvpcb/dialogs/fp_conflict_assignment_selector_base.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Nov 22 2017)
+// C++ code generated with wxFormBuilder (version Apr 19 2018)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -10,6 +10,7 @@
 
 #include <wx/artprov.h>
 #include <wx/xrc/xmlres.h>
+#include <wx/intl.h>
 #include "dialog_shim.h"
 #include <wx/string.h>
 #include <wx/stattext.h>
@@ -49,7 +50,7 @@ class DIALOG_FP_CONFLICT_ASSIGNMENT_SELECTOR_BASE : public DIALOG_SHIM
 	
 	public:
 		
-		DIALOG_FP_CONFLICT_ASSIGNMENT_SELECTOR_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Footprint Assignment Conflicts"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 
+		DIALOG_FP_CONFLICT_ASSIGNMENT_SELECTOR_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Footprint Assignment Conflicts"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 
 		~DIALOG_FP_CONFLICT_ASSIGNMENT_SELECTOR_BASE();
 	
 };
diff --git a/cvpcb/display_footprints_frame.cpp b/cvpcb/display_footprints_frame.cpp
index c713b38813..e81ef62faf 100644
--- a/cvpcb/display_footprints_frame.cpp
+++ b/cvpcb/display_footprints_frame.cpp
@@ -432,7 +432,7 @@ MODULE* DISPLAY_FOOTPRINTS_FRAME::Get_Module( const wxString& aFootprintName )
 
         if( fpid.Parse( aFootprintName ) >= 0 )
         {
-            DisplayInfoMessage( this, wxString::Format( wxT( "Footprint ID \"%s\" is not valid." ),
+            DisplayInfoMessage( this, wxString::Format( _( "Footprint ID \"%s\" is not valid." ),
                                                         GetChars( aFootprintName ) ) );
             return NULL;
         }
diff --git a/cvpcb/readwrite_dlgs.cpp b/cvpcb/readwrite_dlgs.cpp
index 9ca7294b38..bb6d0b1c83 100644
--- a/cvpcb/readwrite_dlgs.cpp
+++ b/cvpcb/readwrite_dlgs.cpp
@@ -100,7 +100,7 @@ void CVPCB_MAINFRAME::SetNewPkg( const wxString& aFootprintName, int aIndex )
     if( !aFootprintName.IsEmpty() )
     {
         wxCHECK_RET( fpid.Parse( aFootprintName ) < 0,
-                     wxString::Format( wxT( "\"%s\" is not a valid LIB_ID." ),
+                     wxString::Format( _( "\"%s\" is not a valid LIB_ID." ),
                                        GetChars( aFootprintName ) ) );
     }
 
diff --git a/pcbnew/router/pns_kicad_iface.cpp b/pcbnew/router/pns_kicad_iface.cpp
index e9ac6953d1..aaadca05af 100644
--- a/pcbnew/router/pns_kicad_iface.cpp
+++ b/pcbnew/router/pns_kicad_iface.cpp
@@ -1128,7 +1128,7 @@ void PNS_KICAD_IFACE::AddItem( PNS::ITEM* aItem )
 void PNS_KICAD_IFACE::Commit()
 {
     EraseView();
-    m_commit->Push( wxT( "Added a track" ) );
+    m_commit->Push( _( "Added a track" ) );
     m_commit.reset( new BOARD_COMMIT( m_tool ) );
 }