diff --git a/3d-viewer/3d_viewer/3d_menubar.cpp b/3d-viewer/3d_viewer/3d_menubar.cpp
index 867b6db73e..125c021955 100644
--- a/3d-viewer/3d_viewer/3d_menubar.cpp
+++ b/3d-viewer/3d_viewer/3d_menubar.cpp
@@ -174,7 +174,7 @@ void EDA_3D_VIEWER::CreateMenuBar()
 
     materialsList->AppendRadioItem( ID_MENU3D_FL_RENDER_MATERIAL_MODE_DIFFUSE_ONLY,
                                     _( "Use Diffuse Only" ),
-                                    _( "Use only the diffuse color property from model 3D model file " ) );
+                                    _( "Use only the diffuse color property from model 3D model file" ) );
 
     materialsList->AppendRadioItem( ID_MENU3D_FL_RENDER_MATERIAL_MODE_CAD_MODE,
                                     _( "CAD Color Style" ),
diff --git a/kicad/menubar.cpp b/kicad/menubar.cpp
index 994b2602aa..a45c4ff5a1 100644
--- a/kicad/menubar.cpp
+++ b/kicad/menubar.cpp
@@ -386,7 +386,7 @@ void KICAD_MANAGER_FRAME::ReCreateMenuBar()
     msg = AddHotkeyName( _( "Convert Image" ),
                          kicad_Manager_Hokeys_Descr, HK_RUN_BM2COMPONENT );
     AddMenuItem( toolsMenu, ID_TO_BITMAP_CONVERTER, msg,
-                 _( "Convert bitmap images to schematic or PCB components" ),
+                 _( "Convert bitmap images to schematic or PCB components." ),
                  KiBitmap( bitmap2component_xpm ) );
 
     msg = AddHotkeyName( _( "Calculator Tools" ), kicad_Manager_Hokeys_Descr, HK_RUN_PCBCALCULATOR );
diff --git a/pcbnew/dialogs/panel_pcbnew_settings_base.cpp b/pcbnew/dialogs/panel_pcbnew_settings_base.cpp
index 251cc1d80a..09545f43d9 100644
--- a/pcbnew/dialogs/panel_pcbnew_settings_base.cpp
+++ b/pcbnew/dialogs/panel_pcbnew_settings_base.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Dec 30 2017)
+// C++ code generated with wxFormBuilder (version Jul 11 2018)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -124,7 +124,7 @@ PANEL_PCBNEW_SETTINGS_BASE::PANEL_PCBNEW_SETTINGS_BASE( wxWindow* parent, wxWind
 	
 	m_Track_DoubleSegm_Ctrl = new wxCheckBox( bLegacyOptionsSizer->GetStaticBox(), wxID_ANY, _("&Use double segmented tracks"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_Track_DoubleSegm_Ctrl->SetValue(true); 
-	m_Track_DoubleSegm_Ctrl->SetToolTip( _("Use two track segments, with 45 degrees angle between them, when drawing a new track ") );
+	m_Track_DoubleSegm_Ctrl->SetToolTip( _("Use two track segments, with 45 degrees angle between them, when drawing a new track") );
 	
 	bLegacyOptionsSizer->Add( m_Track_DoubleSegm_Ctrl, 0, wxBOTTOM|wxLEFT|wxRIGHT, 5 );
 	
diff --git a/pcbnew/dialogs/panel_pcbnew_settings_base.fbp b/pcbnew/dialogs/panel_pcbnew_settings_base.fbp
index a45a74e66b..c64aa210c3 100644
--- a/pcbnew/dialogs/panel_pcbnew_settings_base.fbp
+++ b/pcbnew/dialogs/panel_pcbnew_settings_base.fbp
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <wxFormBuilder_Project>
-    <FileVersion major="1" minor="13" />
+    <FileVersion major="1" minor="14" />
     <object class="Project" expanded="1">
         <property name="class_decoration"></property>
         <property name="code_generation">C++</property>
@@ -14,6 +14,7 @@
         <property name="file">panel_pcbnew_settings_base</property>
         <property name="first_id">1000</property>
         <property name="help_provider">none</property>
+        <property name="indent_with_spaces"></property>
         <property name="internationalize">1</property>
         <property name="name">PanelPcbnewSettings</property>
         <property name="namespace"></property>
@@ -48,13 +49,20 @@
             <property name="window_extra_style"></property>
             <property name="window_name"></property>
             <property name="window_style">wxTAB_TRAVERSAL</property>
-            <event name="OnAuiFindManager"></event>
+            <event name="OnAuiPaneActivated"></event>
             <event name="OnAuiPaneButton"></event>
             <event name="OnAuiPaneClose"></event>
             <event name="OnAuiPaneMaximize"></event>
             <event name="OnAuiPaneRestore"></event>
             <event name="OnAuiRender"></event>
+            <event name="OnAux1DClick"></event>
+            <event name="OnAux1Down"></event>
+            <event name="OnAux1Up"></event>
+            <event name="OnAux2DClick"></event>
+            <event name="OnAux2Down"></event>
+            <event name="OnAux2Up"></event>
             <event name="OnChar"></event>
+            <event name="OnCharHook"></event>
             <event name="OnEnterWindow"></event>
             <event name="OnEraseBackground"></event>
             <event name="OnInitDialog"></event>
@@ -165,7 +173,14 @@
                                         <property name="window_extra_style"></property>
                                         <property name="window_name"></property>
                                         <property name="window_style"></property>
+                                        <event name="OnAux1DClick"></event>
+                                        <event name="OnAux1Down"></event>
+                                        <event name="OnAux1Up"></event>
+                                        <event name="OnAux2DClick"></event>
+                                        <event name="OnAux2Down"></event>
+                                        <event name="OnAux2Up"></event>
                                         <event name="OnChar"></event>
+                                        <event name="OnCharHook"></event>
                                         <event name="OnEnterWindow"></event>
                                         <event name="OnEraseBackground"></event>
                                         <event name="OnKeyDown"></event>
@@ -255,7 +270,14 @@
                                         <property name="window_extra_style"></property>
                                         <property name="window_name"></property>
                                         <property name="window_style"></property>
+                                        <event name="OnAux1DClick"></event>
+                                        <event name="OnAux1Down"></event>
+                                        <event name="OnAux1Up"></event>
+                                        <event name="OnAux2DClick"></event>
+                                        <event name="OnAux2Down"></event>
+                                        <event name="OnAux2Up"></event>
                                         <event name="OnChar"></event>
+                                        <event name="OnCharHook"></event>
                                         <event name="OnEnterWindow"></event>
                                         <event name="OnEraseBackground"></event>
                                         <event name="OnKeyDown"></event>
@@ -356,7 +378,14 @@
                                                 <property name="window_extra_style"></property>
                                                 <property name="window_name"></property>
                                                 <property name="window_style"></property>
+                                                <event name="OnAux1DClick"></event>
+                                                <event name="OnAux1Down"></event>
+                                                <event name="OnAux1Up"></event>
+                                                <event name="OnAux2DClick"></event>
+                                                <event name="OnAux2Down"></event>
+                                                <event name="OnAux2Up"></event>
                                                 <event name="OnChar"></event>
+                                                <event name="OnCharHook"></event>
                                                 <event name="OnCheckBox"></event>
                                                 <event name="OnEnterWindow"></event>
                                                 <event name="OnEraseBackground"></event>
@@ -444,7 +473,14 @@
                                                 <property name="window_extra_style"></property>
                                                 <property name="window_name"></property>
                                                 <property name="window_style"></property>
+                                                <event name="OnAux1DClick"></event>
+                                                <event name="OnAux1Down"></event>
+                                                <event name="OnAux1Up"></event>
+                                                <event name="OnAux2DClick"></event>
+                                                <event name="OnAux2Down"></event>
+                                                <event name="OnAux2Up"></event>
                                                 <event name="OnChar"></event>
+                                                <event name="OnCharHook"></event>
                                                 <event name="OnCheckBox"></event>
                                                 <event name="OnEnterWindow"></event>
                                                 <event name="OnEraseBackground"></event>
@@ -532,7 +568,14 @@
                                                 <property name="window_extra_style"></property>
                                                 <property name="window_name"></property>
                                                 <property name="window_style"></property>
+                                                <event name="OnAux1DClick"></event>
+                                                <event name="OnAux1Down"></event>
+                                                <event name="OnAux1Up"></event>
+                                                <event name="OnAux2DClick"></event>
+                                                <event name="OnAux2Down"></event>
+                                                <event name="OnAux2Up"></event>
                                                 <event name="OnChar"></event>
+                                                <event name="OnCharHook"></event>
                                                 <event name="OnCheckBox"></event>
                                                 <event name="OnEnterWindow"></event>
                                                 <event name="OnEraseBackground"></event>
@@ -620,7 +663,14 @@
                                                 <property name="window_extra_style"></property>
                                                 <property name="window_name"></property>
                                                 <property name="window_style"></property>
+                                                <event name="OnAux1DClick"></event>
+                                                <event name="OnAux1Down"></event>
+                                                <event name="OnAux1Up"></event>
+                                                <event name="OnAux2DClick"></event>
+                                                <event name="OnAux2Down"></event>
+                                                <event name="OnAux2Up"></event>
                                                 <event name="OnChar"></event>
+                                                <event name="OnCharHook"></event>
                                                 <event name="OnCheckBox"></event>
                                                 <event name="OnEnterWindow"></event>
                                                 <event name="OnEraseBackground"></event>
@@ -695,6 +745,7 @@
                                                         <property name="hidden">0</property>
                                                         <property name="id">wxID_ANY</property>
                                                         <property name="label">&amp;Rotation angle:</property>
+                                                        <property name="markup">0</property>
                                                         <property name="max_size"></property>
                                                         <property name="maximize_button">0</property>
                                                         <property name="maximum_size"></property>
@@ -720,7 +771,14 @@
                                                         <property name="window_name"></property>
                                                         <property name="window_style"></property>
                                                         <property name="wrap">-1</property>
+                                                        <event name="OnAux1DClick"></event>
+                                                        <event name="OnAux1Down"></event>
+                                                        <event name="OnAux1Up"></event>
+                                                        <event name="OnAux2DClick"></event>
+                                                        <event name="OnAux2Down"></event>
+                                                        <event name="OnAux2Up"></event>
                                                         <event name="OnChar"></event>
+                                                        <event name="OnCharHook"></event>
                                                         <event name="OnEnterWindow"></event>
                                                         <event name="OnEraseBackground"></event>
                                                         <event name="OnKeyDown"></event>
@@ -807,7 +865,14 @@
                                                         <property name="window_extra_style"></property>
                                                         <property name="window_name"></property>
                                                         <property name="window_style"></property>
+                                                        <event name="OnAux1DClick"></event>
+                                                        <event name="OnAux1Down"></event>
+                                                        <event name="OnAux1Up"></event>
+                                                        <event name="OnAux2DClick"></event>
+                                                        <event name="OnAux2Down"></event>
+                                                        <event name="OnAux2Up"></event>
                                                         <event name="OnChar"></event>
+                                                        <event name="OnCharHook"></event>
                                                         <event name="OnEnterWindow"></event>
                                                         <event name="OnEraseBackground"></event>
                                                         <event name="OnKeyDown"></event>
@@ -915,7 +980,14 @@
                                         <property name="window_extra_style"></property>
                                         <property name="window_name"></property>
                                         <property name="window_style"></property>
+                                        <event name="OnAux1DClick"></event>
+                                        <event name="OnAux1Down"></event>
+                                        <event name="OnAux1Up"></event>
+                                        <event name="OnAux2DClick"></event>
+                                        <event name="OnAux2Down"></event>
+                                        <event name="OnAux2Up"></event>
                                         <event name="OnChar"></event>
+                                        <event name="OnCharHook"></event>
                                         <event name="OnEnterWindow"></event>
                                         <event name="OnEraseBackground"></event>
                                         <event name="OnKeyDown"></event>
@@ -1005,7 +1077,14 @@
                                         <property name="window_extra_style"></property>
                                         <property name="window_name"></property>
                                         <property name="window_style"></property>
+                                        <event name="OnAux1DClick"></event>
+                                        <event name="OnAux1Down"></event>
+                                        <event name="OnAux1Up"></event>
+                                        <event name="OnAux2DClick"></event>
+                                        <event name="OnAux2Down"></event>
+                                        <event name="OnAux2Up"></event>
                                         <event name="OnChar"></event>
+                                        <event name="OnCharHook"></event>
                                         <event name="OnEnterWindow"></event>
                                         <event name="OnEraseBackground"></event>
                                         <event name="OnKeyDown"></event>
@@ -1106,7 +1185,14 @@
                                                 <property name="window_extra_style"></property>
                                                 <property name="window_name"></property>
                                                 <property name="window_style"></property>
+                                                <event name="OnAux1DClick"></event>
+                                                <event name="OnAux1Down"></event>
+                                                <event name="OnAux1Up"></event>
+                                                <event name="OnAux2DClick"></event>
+                                                <event name="OnAux2Down"></event>
+                                                <event name="OnAux2Up"></event>
                                                 <event name="OnChar"></event>
+                                                <event name="OnCharHook"></event>
                                                 <event name="OnCheckBox"></event>
                                                 <event name="OnEnterWindow"></event>
                                                 <event name="OnEraseBackground"></event>
@@ -1194,7 +1280,14 @@
                                                 <property name="window_extra_style"></property>
                                                 <property name="window_name"></property>
                                                 <property name="window_style"></property>
+                                                <event name="OnAux1DClick"></event>
+                                                <event name="OnAux1Down"></event>
+                                                <event name="OnAux1Up"></event>
+                                                <event name="OnAux2DClick"></event>
+                                                <event name="OnAux2Down"></event>
+                                                <event name="OnAux2Up"></event>
                                                 <event name="OnChar"></event>
+                                                <event name="OnCharHook"></event>
                                                 <event name="OnCheckBox"></event>
                                                 <event name="OnEnterWindow"></event>
                                                 <event name="OnEraseBackground"></event>
@@ -1282,7 +1375,14 @@
                                                 <property name="window_extra_style"></property>
                                                 <property name="window_name"></property>
                                                 <property name="window_style"></property>
+                                                <event name="OnAux1DClick"></event>
+                                                <event name="OnAux1Down"></event>
+                                                <event name="OnAux1Up"></event>
+                                                <event name="OnAux2DClick"></event>
+                                                <event name="OnAux2Down"></event>
+                                                <event name="OnAux2Up"></event>
                                                 <event name="OnChar"></event>
+                                                <event name="OnCharHook"></event>
                                                 <event name="OnCheckBox"></event>
                                                 <event name="OnEnterWindow"></event>
                                                 <event name="OnEraseBackground"></event>
@@ -1362,7 +1462,7 @@
                                                 <property name="style"></property>
                                                 <property name="subclass"></property>
                                                 <property name="toolbar_pane">0</property>
-                                                <property name="tooltip">Use two track segments, with 45 degrees angle between them, when drawing a new track </property>
+                                                <property name="tooltip">Use two track segments, with 45 degrees angle between them, when drawing a new track</property>
                                                 <property name="validator_data_type"></property>
                                                 <property name="validator_style">wxFILTER_NONE</property>
                                                 <property name="validator_type">wxDefaultValidator</property>
@@ -1370,7 +1470,14 @@
                                                 <property name="window_extra_style"></property>
                                                 <property name="window_name"></property>
                                                 <property name="window_style"></property>
+                                                <event name="OnAux1DClick"></event>
+                                                <event name="OnAux1Down"></event>
+                                                <event name="OnAux1Up"></event>
+                                                <event name="OnAux2DClick"></event>
+                                                <event name="OnAux2Down"></event>
+                                                <event name="OnAux2Up"></event>
                                                 <event name="OnChar"></event>
+                                                <event name="OnCharHook"></event>
                                                 <event name="OnCheckBox"></event>
                                                 <event name="OnEnterWindow"></event>
                                                 <event name="OnEraseBackground"></event>
diff --git a/pcbnew/dialogs/panel_pcbnew_settings_base.h b/pcbnew/dialogs/panel_pcbnew_settings_base.h
index 5400fc9a6b..dd7e63cb26 100644
--- a/pcbnew/dialogs/panel_pcbnew_settings_base.h
+++ b/pcbnew/dialogs/panel_pcbnew_settings_base.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Dec 30 2017)
+// C++ code generated with wxFormBuilder (version Jul 11 2018)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
diff --git a/pcbnew/kicad_plugin.cpp b/pcbnew/kicad_plugin.cpp
index 0766ef9c48..4ccc2e94dd 100644
--- a/pcbnew/kicad_plugin.cpp
+++ b/pcbnew/kicad_plugin.cpp
@@ -2089,7 +2089,7 @@ void PCB_IO::FootprintSave( const wxString& aLibraryPath, const MODULE* aFootpri
 
     if( fn.FileExists() && !fn.IsFileWritable() )
     {
-        THROW_IO_ERROR( wxString::Format( _( "No write permissions to delete file \"%s\" " ),
+        THROW_IO_ERROR( wxString::Format( _( "No write permissions to delete file \"%s\"" ),
                                           fn.GetFullPath() ) );
     }