diff --git a/eeschema/controle.cpp b/eeschema/controle.cpp
index 4042d17b91..d7cced6b4e 100644
--- a/eeschema/controle.cpp
+++ b/eeschema/controle.cpp
@@ -164,6 +164,13 @@ SCH_ITEM* SCH_EDIT_FRAME::LocateItem( const wxPoint& aPosition, bool aIncludePin
         return item;
     }
 
+    item = (SCH_ITEM*) PickStruct( aPosition, GetScreen(), DRAW_ITEM_T );
+    if( item )
+    {
+        ClearMsgPanel();
+        return item;
+    }
+
     item = (SCH_ITEM*) PickStruct( aPosition, GetScreen(), FIELD_T );
 
     if( item )
diff --git a/eeschema/netform.cpp b/eeschema/netform.cpp
index c495c70669..c6ef74d8d7 100644
--- a/eeschema/netform.cpp
+++ b/eeschema/netform.cpp
@@ -134,9 +134,9 @@ class EXPORT_HELP
 
     /**
      * Function findNextComponentAndCreatePinList
-     * finds a "suitable" component from the DrawList and optionally builds
-     * its pin list in m_SortedComponentPinList. The list is sorted by pin num.
-     * A suitable component is a "new" real component
+     * finds a component from the DrawList and builds
+     * its pin list in m_SortedComponentPinList. This list is sorted by pin num.
+     * the component is the next actual component after aItem
      * (power symbols and virtual components that have their reference starting by '#'are skipped).
      */
     SCH_COMPONENT* findNextComponentAndCreatePinList( EDA_ITEM* aItem, SCH_SHEET_PATH* aSheetPath );
@@ -145,17 +145,16 @@ class EXPORT_HELP
 
     /**
      * Function eraseDuplicatePins
-     * removes duplicate Pins from the pin list, m_SortedComponentPinList.
+     * erase duplicate Pins from m_SortedComponentPinList (i.e. set pointer in this list to NULL).
      * (This is a list of pins found in the whole schematic, for a single
      * component.) These duplicate pins were put in list because some pins (powers... )
      * are found more than one time when we have a multiple parts per package
      * component. For instance, a 74ls00 has 4 parts, and therefore the VCC pin
      * and GND pin appears 4 times in the list.
-     * @param aPinList = a NETLIST_OBJECT_LIST that contains the list of pins for a
-     * given component.
      * Note: this list *MUST* be sorted by pin number (.m_PinNum member value)
+     * Also set the m_Flag member of "removed" NETLIST_OBJECT pin item to 1
      */
-    void eraseDuplicatePins( NETLIST_OBJECT_LIST& aPinList );
+    void eraseDuplicatePins( );
 
     /**
      * Function addPinToComponentPinList
@@ -607,7 +606,7 @@ SCH_COMPONENT* EXPORT_HELP::findNextComponentAndCreatePinList( EDA_ITEM*       a
               m_SortedComponentPinList.end(), sortPinsByNum );
 
         // Remove duplicate Pins in m_SortedComponentPinList
-        eraseDuplicatePins( m_SortedComponentPinList );
+        eraseDuplicatePins( );
 
         // record the usage of this library component entry.
         m_LibParts.insert( entry );     // rejects non-unique pointers
@@ -1510,14 +1509,14 @@ bool EXPORT_HELP::addPinToComponentPinList( SCH_COMPONENT* aComponent,
  * (i.e. set pointer to duplicate pins to NULL in this list).
  * also set .m_Flag member of "removed" NETLIST_OBJECT pins to 1
  */
-void EXPORT_HELP::eraseDuplicatePins( NETLIST_OBJECT_LIST& aPinList )
+void EXPORT_HELP::eraseDuplicatePins( )
 {
-    if( aPinList.size() == 0 )  // Trivial case: component with no pin
+    if( m_SortedComponentPinList.size() == 0 )  // Trivial case: component with no pin
         return;
 
-    for( unsigned ii = 0; ii < aPinList.size(); ii++ )
+    for( unsigned ii = 0; ii < m_SortedComponentPinList.size(); ii++ )
     {
-        if( aPinList[ii] == NULL ) /* already deleted */
+        if( m_SortedComponentPinList[ii] == NULL ) /* already deleted */
             continue;
 
         /* Search for duplicated pins
@@ -1529,34 +1528,34 @@ void EXPORT_HELP::eraseDuplicatePins( NETLIST_OBJECT_LIST& aPinList )
          * are necessary successive in list
          */
         int idxref = ii;
-        for( unsigned jj = ii + 1; jj < aPinList.size(); jj++ )
+        for( unsigned jj = ii + 1; jj < m_SortedComponentPinList.size(); jj++ )
         {
-            if(  aPinList[jj] == NULL )   // Already removed
+            if(  m_SortedComponentPinList[jj] == NULL )   // Already removed
                 continue;
 
             // if other pin num, stop search,
             // because all pins having the same number are consecutive in list.
-            if( aPinList[idxref]->m_PinNum != aPinList[jj]->m_PinNum )
+            if( m_SortedComponentPinList[idxref]->m_PinNum != m_SortedComponentPinList[jj]->m_PinNum )
                 break;
 
-            if( aPinList[idxref]->m_FlagOfConnection == PAD_CONNECT )
+            if( m_SortedComponentPinList[idxref]->m_FlagOfConnection == PAD_CONNECT )
             {
-                aPinList[jj]->m_Flag = 1;
-                aPinList[jj] = NULL;
+                m_SortedComponentPinList[jj]->m_Flag = 1;
+                m_SortedComponentPinList[jj] = NULL;
             }
             else /* the reference pin is not connected: remove this pin if the
                   * other pin is connected */
             {
-                if( aPinList[jj]->m_FlagOfConnection == PAD_CONNECT )
+                if( m_SortedComponentPinList[jj]->m_FlagOfConnection == PAD_CONNECT )
                 {
-                    aPinList[idxref]->m_Flag = 1;
-                    aPinList[idxref] = NULL;
+                    m_SortedComponentPinList[idxref]->m_Flag = 1;
+                    m_SortedComponentPinList[idxref] = NULL;
                     idxref = jj;
                 }
                 else    // the 2 pins are not connected: remove the tested pin,
                 {       // and continue ...
-                    aPinList[jj]->m_Flag = 1;
-                    aPinList[jj] = NULL;
+                    m_SortedComponentPinList[jj]->m_Flag = 1;
+                    m_SortedComponentPinList[jj] = NULL;
                 }
             }
         }
diff --git a/eeschema/onrightclick.cpp b/eeschema/onrightclick.cpp
index 47750bc0aa..0dc9a98b2a 100644
--- a/eeschema/onrightclick.cpp
+++ b/eeschema/onrightclick.cpp
@@ -178,15 +178,13 @@ bool SCH_EDIT_FRAME::OnRightClick( const wxPoint& aPosition, wxMenu* PopMenu )
             AddMenusForComponent( PopMenu, Component );
         }
     }
-    break;
+        break;
 
     case SCH_COMPONENT_T:
         AddMenusForComponent( PopMenu, (SCH_COMPONENT*) DrawStruct );
         break;
 
     case SCH_LINE_T:
-
-//      if( !flags ) PopMenu->Append(ID_POPUP_SCH_MOVE_ITEM_REQUEST, "Move");
         switch( DrawStruct->GetLayer() )
         {
         case LAYER_WIRE:
@@ -203,7 +201,6 @@ bool SCH_EDIT_FRAME::OnRightClick( const wxPoint& aPosition, wxMenu* PopMenu )
             ADD_MENUITEM( PopMenu, ID_POPUP_SCH_DELETE, _( "Delete Drawing" ), delete_xpm );
             break;
         }
-
         break;
 
     case SCH_SHEET_T:
diff --git a/packaging/windows/nsis/Japanese.nsh b/packaging/windows/nsis/Japanese.nsh
new file mode 100644
index 0000000000..81f3389eaf
--- /dev/null
+++ b/packaging/windows/nsis/Japanese.nsh
@@ -0,0 +1,28 @@
+;Additional text definitions for Japanese
+
+;File name of license file
+LicenseLangString MUILicense ${LANG_JAPANESE} "..\licendoc.txt"
+
+;Component option
+LangString TITLE_SEC01 ${LANG_JAPANESE} "メイン アプリケーション"
+LangString TITLE_SEC02 ${LANG_JAPANESE} "ライブラリとコンポーネント"
+LangString TITLE_SEC03 ${LANG_JAPANESE} "デモンストレーション プロジェクト"
+LangString TITLE_SEC04 ${LANG_JAPANESE} "ヘルプ ファイル"
+
+;Component option descriptions
+LangString DESC_SEC01 ${LANG_JAPANESE} "メイン アプリケーション ファイル"
+LangString DESC_SEC02 ${LANG_JAPANESE} "ライブラリとコンポーネントは以前インストールされていない場合必要です。"
+LangString DESC_SEC03 ${LANG_JAPANESE} "デモンストレーションファイルとチュートリアル"
+LangString DESC_SEC04 ${LANG_JAPANESE} "PDF形式のヘルプファイル"
+
+;General messages
+LangString WINGS3D_PROMPT ${LANG_JAPANESE} "3Dオブジェクトモデルの作成、編集を行うためには Wings3Dをインストールする必要があります。\
+Wings3D とユーザーマニュアルは、このボックスにチェックを入れて Wings3D ウェブページ を開くことでダウンロードできます。"
+
+LangString UNINST_PROMPT ${LANG_JAPANESE} "$(^Name) と全てのコンポーネントを完全に削除します。宜しいですか $\n\
+この操作は全ての新しいファイル、修正されたファイル、プログラムディレクトリ中のライブラリとモジュールも削除します。"
+
+LangString UNINST_SUCCESS ${LANG_JAPANESE} "$(^Name) はあなたのコンピュータから完全に削除されました。"
+LangString INSTALLER_RUNNING ${LANG_JAPANESE} "インストーラは既に起動されています。"
+LangString UNINSTALLER_RUNNING ${LANG_JAPANESE} "アンインストーラは既に起動されています。"
+LangString ALREADY_INSTALLED ${LANG_JAPANESE} "${PRODUCT_NAME} は既にインストールされています。このパッケージインストールは既存のファイルを上書きします。作業を続けますか？"
diff --git a/packaging/windows/nsis/install.nsi b/packaging/windows/nsis/install.nsi
index 239f02f718..f4c190dac6 100644
--- a/packaging/windows/nsis/install.nsi
+++ b/packaging/windows/nsis/install.nsi
@@ -17,7 +17,7 @@
 
 ; General Product Description Definitions
 !define PRODUCT_NAME "KiCad"
-!define PRODUCT_VERSION "2011.01.26"
+!define PRODUCT_VERSION "2011.02.10"
 !define PRODUCT_WEB_SITE "http://iut-tice.ujf-grenoble.fr/kicad/"
 !define SOURCEFORGE_WEB_SITE "http://kicad.sourceforge.net/"
 !define COMPANY_NAME ""
@@ -79,12 +79,14 @@ ShowUnInstDetails hide
 !insertmacro MUI_LANGUAGE "Polish"
 !insertmacro MUI_LANGUAGE "Dutch"
 !insertmacro MUI_LANGUAGE "Russian"
+!insertmacro MUI_LANGUAGE "Japanese"
 
 !include "English.nsh"
 !include "French.nsh"
 !include "Polish.nsh"
 !include "Dutch.nsh"
 !include "Russian.nsh"
+!include "Japanese.nsh"
 
 ; MUI end ------