diff --git a/common/fp_lib_table.cpp b/common/fp_lib_table.cpp
index 3df80ec6d1..fd208eb0cb 100644
--- a/common/fp_lib_table.cpp
+++ b/common/fp_lib_table.cpp
@@ -799,10 +799,13 @@ bool FP_LIB_TABLE::ConvertFromLegacy( NETLIST& aNetList, const wxArrayString& aL
                     wxString uri = cur->rows[i].GetFullURI( true );
 
                     if( wxFileName::GetPathSeparator() == wxChar( '\\' )
-                      && uri.Find( wxChar( '/' ) ) >= 0 )
+                        && uri.Find( wxChar( '/' ) ) >= 0 )
                         uri.Replace( wxT( "/"), wxT( "\\" ) );
-
+#ifdef __WINDOWS__
+                    if( uri.CmpNoCase( libPath ) )
+#else
                     if( uri == libPath )
+#endif
                     {
                         libNickname = cur->rows[i].GetNickName();
                         break;
@@ -827,7 +830,6 @@ bool FP_LIB_TABLE::ConvertFromLegacy( NETLIST& aNetList, const wxArrayString& aL
             else
             {
                 FPID newFPID = lastFPID;
-
                 newFPID.SetLibNickname( libNickname );
 
                 if( !newFPID.IsValid() )
diff --git a/eeschema/dialogs/dialog_choose_component.cpp b/eeschema/dialogs/dialog_choose_component.cpp
index 3f9a74b709..93c40e2505 100644
--- a/eeschema/dialogs/dialog_choose_component.cpp
+++ b/eeschema/dialogs/dialog_choose_component.cpp
@@ -47,6 +47,7 @@ DIALOG_CHOOSE_COMPONENT::DIALOG_CHOOSE_COMPONENT( wxWindow* aParent, const wxStr
     m_search_container->SetTree( m_libraryComponentTree );
     m_searchBox->SetFocus();
     m_componentDetails->SetEditable( false );
+    m_libraryComponentTree->ScrollTo( m_libraryComponentTree->GetFocusedItem() );
 
     // The tree showing libs and component uses a fixed font,
     // because we want controle the position of some info when drawing the
diff --git a/eeschema/getpart.cpp b/eeschema/getpart.cpp
index e273f9459a..200b29bcd3 100644
--- a/eeschema/getpart.cpp
+++ b/eeschema/getpart.cpp
@@ -135,7 +135,13 @@ wxString SCH_BASE_FRAME::SelectComponentFromLibrary( const wxString& aLibname,
     {
         // This is good for a transition for experineced users: giving them a History. Ideally,
         // we actually make this part even faster to access with a popup on ALT-a or something.
-        search_container.AddAliasList( _("-- History --"), aHistoryList, NULL );
+        // the history is under a node named  "-- History --"
+        // However, because it is translatable, and we need to have a node name starting by "-- "
+        // because we (later) sort all node names alphabetically and this node should be the first,
+        // we build it with only with "History" string translatable
+        wxString nodename;
+        nodename  << wxT("-- ") << _("History") << wxT(" --");
+        search_container.AddAliasList( nodename, aHistoryList, NULL );
         search_container.SetPreselectNode( aHistoryList[0], aHistoryLastUnit );
     }
 
diff --git a/eeschema/operations_on_items_lists.cpp b/eeschema/operations_on_items_lists.cpp
index 2b417e0020..e897d8d735 100644
--- a/eeschema/operations_on_items_lists.cpp
+++ b/eeschema/operations_on_items_lists.cpp
@@ -59,11 +59,6 @@ void RotateListOfItems( PICKED_ITEMS_LIST& aItemsList, wxPoint& rotationPoint )
 }
 
 
-void DeleteItemsInList( EDA_DRAW_PANEL* panel, PICKED_ITEMS_LIST& aItemsList );
-void DuplicateItemsInList( SCH_SCREEN* screen, PICKED_ITEMS_LIST& aItemsList,
-                           const wxPoint aMoveVector  );
-
-
 void MirrorY( PICKED_ITEMS_LIST& aItemsList, wxPoint& aMirrorPoint )
 {
     for( unsigned ii = 0; ii < aItemsList.GetCount(); ii++ )
diff --git a/eeschema/viewlib_frame.cpp b/eeschema/viewlib_frame.cpp
index 39e55ac1ff..b6a3b296a6 100644
--- a/eeschema/viewlib_frame.cpp
+++ b/eeschema/viewlib_frame.cpp
@@ -416,6 +416,10 @@ void LIB_VIEW_FRAME::SetSelectedLibrary( const wxString& aLibraryName )
     m_canvas->Refresh();
     DisplayLibInfos();
     ReCreateHToolbar();
+    // Ensure the corresponding line in m_libList is selected
+    // (which is not necessary the case if SetSelectedLibrary is called
+    // by an other caller than ClickOnLibList.
+    m_libList->SetStringSelection( m_libraryName, true );
 }
 
 
@@ -435,6 +439,10 @@ void LIB_VIEW_FRAME::SetSelectedComponent( const wxString& aComponentName )
     if( m_entryName.CmpNoCase( aComponentName ) != 0 )
     {
         m_entryName = aComponentName;
+        // Ensure the corresponding line in m_cmpList is selected
+        // (which is not necessary the case if SetSelectedComponent is called
+        // by an other caller than ClickOnCmpList.
+        m_cmpList->SetStringSelection( aComponentName, true );
         DisplayLibInfos();
         m_unit    = 1;
         m_convert = 1;
diff --git a/kicad/menubar.cpp b/kicad/menubar.cpp
index 62cf7a321e..d560d93c1a 100644
--- a/kicad/menubar.cpp
+++ b/kicad/menubar.cpp
@@ -193,14 +193,14 @@ void KICAD_MANAGER_FRAME::ReCreateMenuBar()
     // Text editor
     AddMenuItem( browseMenu,
                  ID_TO_EDITOR,
-                 _( "Open Text E&ditor" ),
+                 _( "Launch Text E&ditor" ),
                  _( "Launch preferred text editor" ),
                  KiBitmap( editor_xpm ) );
 
     // View file
     AddMenuItem( browseMenu,
                  ID_BROWSE_AN_SELECT_FILE,
-                 _( "&Open Local File" ),
+                 _( "&Edit Local File" ),
                  _( "Edit local file" ),
                  KiBitmap( browse_files_xpm ) );
 
diff --git a/pcbnew/pad_edition_functions.cpp b/pcbnew/pad_edition_functions.cpp
index 27ea996d8f..7823dfa5b7 100644
--- a/pcbnew/pad_edition_functions.cpp
+++ b/pcbnew/pad_edition_functions.cpp
@@ -121,6 +121,8 @@ void PCB_BASE_FRAME::Import_Pad_Settings( D_PAD* aPad, bool aDraw )
         m_canvas->RefreshDrawingRect( aPad->GetBoundingBox() );
 
     aPad->GetParent()->SetLastEditTime();
+
+    OnModify();
 }
 
 /** Compute the 'next' pad number for autoincrement
@@ -132,8 +134,8 @@ static wxString GetNextPadName( wxString aPadName )
     int ponder = 1;
 
     // Trim and extract the trailing numeric part
-    while( aPadName.Len() 
-            && aPadName.Last() >= '0' 
+    while( aPadName.Len()
+            && aPadName.Last() >= '0'
             && aPadName.Last() <= '9' )
     {
         num += ( aPadName.Last() - '0' ) * ponder;