diff --git a/Documentation/releases/2010-xx-xx.html b/Documentation/releases/2010-xx-xx.html
index c248698e35..cefbf9ae8f 100644
--- a/Documentation/releases/2010-xx-xx.html
+++ b/Documentation/releases/2010-xx-xx.html
@@ -441,7 +441,7 @@ Plot SVG output
 <div class="ulist"><ul>
 <li>
 <p>
-Bug fixed when added directory with alot of subdirectories, now you need to add yourself.
+Issue fixed when opening a project in a directory with a lot of subdirectories
 </p>
 </li>
 <li>
diff --git a/Documentation/releases/2010-xx-xx.txt b/Documentation/releases/2010-xx-xx.txt
index 8b881705b6..e2f0fa8315 100644
--- a/Documentation/releases/2010-xx-xx.txt
+++ b/Documentation/releases/2010-xx-xx.txt
@@ -9,27 +9,27 @@ KiCad 2010-xx-xx Release
   * Plot and print dialog rewritten
   * Remember last dialog position and tab
   * Hershey fonts
-  * Generation of bill of materials 
+  * Generation of bill of materials
   * Plot SVG output
 
 == KiCad
-  * Bug fixed when added directory with alot of subdirectories, now you need to add yourself.
+  * Issue fixed when opening a project in a directory with a lot of subdirectories.
   * If project is noname.pro no `error` will be displayed
 
 == EESchema
-  * New pin properties dialog 
+  * New pin properties dialog
 
 == PCBNew
   * Advanced layer setup
   * New panel for layer management
   * Support for net classes
   * Incorrect DRC error fixed, DRC min via and min track check
-  * Handle local mask clearance and local net clearance 
+  * Handle local mask clearance and local net clearance
 
 == Core
   * Many many bugfixes and cleanups
   * All comments translated to English
-  * Moved to wxAUI and dialogs created with wxFormBuilder 
+  * Moved to wxAUI and dialogs created with wxFormBuilder
   * Full support for Mac OS X with wxWidgets 2.9
 
 ///////////////////////////////////////
diff --git a/common/drawpanel.cpp b/common/drawpanel.cpp
index 92957b95e3..57172358ad 100644
--- a/common/drawpanel.cpp
+++ b/common/drawpanel.cpp
@@ -421,7 +421,6 @@ void WinEDA_DrawPanel::OnActivate( wxActivateEvent& event )
     event.Skip();
 }
 
-
 void WinEDA_DrawPanel::OnScroll( wxScrollWinEvent& event )
 {
     int id = event.GetEventType();
@@ -490,13 +489,10 @@ void WinEDA_DrawPanel::OnScroll( wxScrollWinEvent& event )
                      "posX=%d, posY=%d" ), ppux, ppuy, unitsX, unitsY, x, y );
 #endif
 
-    SetScrollbars( ppux, ppuy, unitsX, unitsY, x, y, true );
-    INSTALL_DC( dc, this );
-    ReDraw( &dc, true );
+    Scroll( x/ppux, y/ppux );
     event.Skip();
 }
 
-
 void WinEDA_DrawPanel::OnSize( wxSizeEvent& event )
 {
     if( IsShown() )
@@ -1447,9 +1443,7 @@ void WinEDA_DrawPanel::OnPan( wxCommandEvent& event )
     if( y > maxY )
         y = maxY;
 
-    SetScrollbars( ppux, ppuy, unitsX, unitsY, x, y, true );
-    INSTALL_DC( dc, this );
-    ReDraw( &dc, true );
+    Scroll( x/ppux, y/ppux );
 }
 
 
diff --git a/eeschema/dialog_SVG_print_base.cpp b/eeschema/dialog_SVG_print_base.cpp
index 09e8643a28..9f3eddc338 100644
--- a/eeschema/dialog_SVG_print_base.cpp
+++ b/eeschema/dialog_SVG_print_base.cpp
@@ -45,23 +45,24 @@ DIALOG_SVG_PRINT_base::DIALOG_SVG_PRINT_base( wxWindow* parent, wxWindowID id, c
 	
 	sbOptionsSizer->Add( m_Print_Sheet_Ref, 0, wxALL, 5 );
 	
-	bUpperSizer->Add( sbOptionsSizer, 1, wxEXPAND, 5 );
+	bUpperSizer->Add( sbOptionsSizer, 1, 0, 5 );
 	
 	wxBoxSizer* bButtonsSizer;
 	bButtonsSizer = new wxBoxSizer( wxVERTICAL );
 	
 	m_buttonPlotCurrent = new wxButton( this, wxID_PRINT_CURRENT, _("Print Current"), wxDefaultPosition, wxDefaultSize, 0 );
-	bButtonsSizer->Add( m_buttonPlotCurrent, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	bButtonsSizer->Add( m_buttonPlotCurrent, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
 	
 	m_buttonPlotAll = new wxButton( this, wxID_PRINT_ALL, _("Print All"), wxDefaultPosition, wxDefaultSize, 0 );
-	bButtonsSizer->Add( m_buttonPlotAll, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	m_buttonPlotAll->SetDefault(); 
+	bButtonsSizer->Add( m_buttonPlotAll, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
 	
 	m_buttonQuit = new wxButton( this, wxID_CANCEL, _("Quit"), wxDefaultPosition, wxDefaultSize, 0 );
-	bButtonsSizer->Add( m_buttonQuit, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	bButtonsSizer->Add( m_buttonQuit, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
 	
 	bUpperSizer->Add( bButtonsSizer, 0, wxALIGN_CENTER_VERTICAL, 5 );
 	
-	bMainSizer->Add( bUpperSizer, 1, wxEXPAND, 5 );
+	bMainSizer->Add( bUpperSizer, 0, wxEXPAND, 5 );
 	
 	m_staticText1 = new wxStaticText( this, wxID_ANY, _("Filename:"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_staticText1->Wrap( -1 );
@@ -78,6 +79,8 @@ DIALOG_SVG_PRINT_base::DIALOG_SVG_PRINT_base( wxWindow* parent, wxWindowID id, c
 	bMainSizer->Add( m_staticText2, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
 	
 	m_MessagesBox = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE );
+	m_MessagesBox->SetMinSize( wxSize( -1,80 ) );
+	
 	bMainSizer->Add( m_MessagesBox, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
 	
 	this->SetSizer( bMainSizer );
diff --git a/eeschema/dialog_SVG_print_base.fbp b/eeschema/dialog_SVG_print_base.fbp
index 9a9bfd90cd..54dc016df2 100644
--- a/eeschema/dialog_SVG_print_base.fbp
+++ b/eeschema/dialog_SVG_print_base.fbp
@@ -32,7 +32,7 @@
             <property name="minimum_size">-1,-1</property>
             <property name="name">DIALOG_SVG_PRINT_base</property>
             <property name="pos"></property>
-            <property name="size">550,459</property>
+            <property name="size">550,446</property>
             <property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property>
             <property name="subclass"></property>
             <property name="title">Create SVG file</property>
@@ -78,7 +78,7 @@
                 <object class="sizeritem" expanded="1">
                     <property name="border">5</property>
                     <property name="flag">wxEXPAND</property>
-                    <property name="proportion">1</property>
+                    <property name="proportion">0</property>
                     <object class="wxBoxSizer" expanded="1">
                         <property name="minimum_size"></property>
                         <property name="name">bUpperSizer</property>
@@ -86,7 +86,7 @@
                         <property name="permission">none</property>
                         <object class="sizeritem" expanded="1">
                             <property name="border">5</property>
-                            <property name="flag">wxEXPAND</property>
+                            <property name="flag"></property>
                             <property name="proportion">1</property>
                             <object class="wxStaticBoxSizer" expanded="1">
                                 <property name="id">wxID_ANY</property>
@@ -321,7 +321,7 @@
                                 <property name="permission">none</property>
                                 <object class="sizeritem" expanded="1">
                                     <property name="border">5</property>
-                                    <property name="flag">wxALL|wxALIGN_CENTER_HORIZONTAL</property>
+                                    <property name="flag">wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND</property>
                                     <property name="proportion">0</property>
                                     <object class="wxButton" expanded="1">
                                         <property name="bg"></property>
@@ -373,12 +373,12 @@
                                 </object>
                                 <object class="sizeritem" expanded="1">
                                     <property name="border">5</property>
-                                    <property name="flag">wxALL|wxALIGN_CENTER_HORIZONTAL</property>
+                                    <property name="flag">wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND</property>
                                     <property name="proportion">0</property>
                                     <object class="wxButton" expanded="1">
                                         <property name="bg"></property>
                                         <property name="context_help"></property>
-                                        <property name="default">0</property>
+                                        <property name="default">1</property>
                                         <property name="enabled">1</property>
                                         <property name="fg"></property>
                                         <property name="font"></property>
@@ -425,7 +425,7 @@
                                 </object>
                                 <object class="sizeritem" expanded="1">
                                     <property name="border">5</property>
-                                    <property name="flag">wxALL|wxALIGN_CENTER_HORIZONTAL</property>
+                                    <property name="flag">wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND</property>
                                     <property name="proportion">0</property>
                                     <object class="wxButton" expanded="1">
                                         <property name="bg"></property>
@@ -650,7 +650,7 @@
                         <property name="id">wxID_ANY</property>
                         <property name="maximum_size"></property>
                         <property name="maxlength">0</property>
-                        <property name="minimum_size"></property>
+                        <property name="minimum_size">-1,80</property>
                         <property name="name">m_MessagesBox</property>
                         <property name="permission">protected</property>
                         <property name="pos"></property>
diff --git a/eeschema/dialog_SVG_print_base.h b/eeschema/dialog_SVG_print_base.h
index 7803803567..593ddcb078 100644
--- a/eeschema/dialog_SVG_print_base.h
+++ b/eeschema/dialog_SVG_print_base.h
@@ -62,7 +62,7 @@ class DIALOG_SVG_PRINT_base : public wxDialog
 		
 	
 	public:
-		DIALOG_SVG_PRINT_base( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Create SVG file"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 550,459 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
+		DIALOG_SVG_PRINT_base( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Create SVG file"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 550,446 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
 		~DIALOG_SVG_PRINT_base();
 	
 };
diff --git a/eeschema/files-io.cpp b/eeschema/files-io.cpp
index 7a4f9f32a3..c72240d0d3 100644
--- a/eeschema/files-io.cpp
+++ b/eeschema/files-io.cpp
@@ -92,18 +92,17 @@ int WinEDA_SchematicFrame::LoadOneEEProject( const wxString& FileName,
         SAFE_DELETE( g_RootSheet );
     }
     CreateScreens();
-    ActiveScreen = GetScreen();
     screen = (SCH_SCREEN*) GetScreen();
 
     wxSetWorkingDirectory( wxPathOnly( FullFileName ) );
-    GetScreen()->m_FileName = FullFileName;
+    screen->m_FileName = FullFileName;
     g_RootSheet->SetFileName( FullFileName );
     Affiche_Message( wxEmptyString );
     ClearMsgPanel();
 
     memset( &g_EESchemaVar, 0, sizeof(g_EESchemaVar) );
 
-    GetScreen()->ClrModify();
+    screen->ClrModify();
 
     if( IsNew )
     {
@@ -215,8 +214,7 @@ Error: %s" ),
     bool diag = g_RootSheet->Load( this );
 
     /* Redraw base screen (ROOT) if necessary. */
-    ActiveScreen = GetScreen();
-    ActiveScreen->SetGrid( ID_POPUP_GRID_LEVEL_1000 + m_LastGridSizeId  );
+    GetScreen()->SetGrid( ID_POPUP_GRID_LEVEL_1000 + m_LastGridSizeId  );
     Zoom_Automatique( FALSE );
     SetSheetNumberAndCount();
     DrawPanel->Refresh( true );
diff --git a/internat/fr/kicad.mo b/internat/fr/kicad.mo
index 53d5f16600..b9c9520ad1 100644
Binary files a/internat/fr/kicad.mo and b/internat/fr/kicad.mo differ
diff --git a/internat/fr/kicad.po b/internat/fr/kicad.po
index a2b471a672..5d2cd51ab9 100644
--- a/internat/fr/kicad.po
+++ b/internat/fr/kicad.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: kicad\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-19 08:35+0100\n"
-"PO-Revision-Date: 2010-02-19 08:43+0100\n"
+"POT-Creation-Date: 2010-02-22 20:56+0100\n"
+"PO-Revision-Date: 2010-02-22 20:58+0100\n"
 "Last-Translator: \n"
 "Language-Team: kicad team <jean-pierre.charras@ujf-grenoble.fr>\n"
 "MIME-Version: 1.0\n"
@@ -680,67 +680,67 @@ msgstr "Diamètre uVia en NetClass &lt; limite globale"
 msgid "NetClass uVia Drill &lt; global limit"
 msgstr "Diamètre de perçage de uVia en NetClassl &lt; limite globale"
 
-#: pcbnew/class_pad.cpp:496
+#: pcbnew/class_pad.cpp:498
 msgid "Unknown pad shape"
 msgstr "Forme pad inconnue"
 
-#: pcbnew/class_pad.cpp:578
+#: pcbnew/class_pad.cpp:580
 msgid "Module"
 msgstr "Module"
 
-#: pcbnew/class_pad.cpp:580
+#: pcbnew/class_pad.cpp:582
 msgid "RefP"
 msgstr "RefP"
 
-#: pcbnew/class_pad.cpp:583
+#: pcbnew/class_pad.cpp:585
 msgid "Net"
 msgstr "Net"
 
-#: pcbnew/class_pad.cpp:654
+#: pcbnew/class_pad.cpp:656
 msgid "Non-copper"
 msgstr "Non-cuivre"
 
-#: pcbnew/class_pad.cpp:662
+#: pcbnew/class_pad.cpp:664
 msgid " & int"
 msgstr " & int"
 
-#: pcbnew/class_pad.cpp:690
+#: pcbnew/class_pad.cpp:692
 msgid "internal"
 msgstr "interne"
 
-#: pcbnew/class_pad.cpp:693
+#: pcbnew/class_pad.cpp:695
 #: pcbnew/class_pcb_text.cpp:234
 msgid "Layer"
 msgstr "Couche"
 
-#: pcbnew/class_pad.cpp:703
+#: pcbnew/class_pad.cpp:705
 #: pcbnew/class_pcb_text.cpp:249
 msgid "H Size"
 msgstr "Taille H"
 
-#: pcbnew/class_pad.cpp:706
+#: pcbnew/class_pad.cpp:708
 #: pcbnew/class_pcb_text.cpp:252
 msgid "V Size"
 msgstr "Taille V"
 
-#: pcbnew/class_pad.cpp:711
+#: pcbnew/class_pad.cpp:713
 msgid "Drill"
 msgstr "Perçage"
 
-#: pcbnew/class_pad.cpp:719
+#: pcbnew/class_pad.cpp:721
 msgid "Drill X / Y"
 msgstr "Perçage X/Y"
 
-#: pcbnew/class_pad.cpp:730
+#: pcbnew/class_pad.cpp:732
 #: pcbnew/class_pcb_text.cpp:243
 msgid "Orient"
 msgstr "Orient"
 
-#: pcbnew/class_pad.cpp:733
+#: pcbnew/class_pad.cpp:735
 msgid "X Pos"
 msgstr "X Pos"
 
-#: pcbnew/class_pad.cpp:736
+#: pcbnew/class_pad.cpp:738
 msgid "Y pos"
 msgstr "Y pos"
 
@@ -1606,10 +1606,6 @@ msgstr "Ajout d'éléments graphiques"
 msgid "Place anchor"
 msgstr "Place Ancre"
 
-#: pcbnew/pcbnew.cpp:102
-msgid "Pcbnew is already running, Continue?"
-msgstr "Pcbnew est en cours d'exécution. Continuer ?"
-
 #: pcbnew/initpcb.cpp:47
 msgid "Ok to delete selected items ?"
 msgstr "Ok pour effacer les éléments sélectionnés ?"
@@ -1952,6 +1948,10 @@ msgstr "Nb Segms"
 msgid "Error: Unexpected end of file !"
 msgstr "Erreur: Fin de fichier inattendue !"
 
+#: pcbnew/pcbnew.cpp:107
+msgid "Pcbnew is already running, Continue?"
+msgstr "Pcbnew est en cours d'exécution. Continuer ?"
+
 #: pcbnew/pcbplot.cpp:558
 msgid "Warning: Scale option set to a very small value"
 msgstr "Attention: option d'échelle ajustée à une valeur très petite"
@@ -1997,17 +1997,17 @@ msgstr "Chemin déjà en usage"
 msgid "Footprint document file:"
 msgstr "Documentation des Modules:"
 
-#: pcbnew/swap_layers.cpp:68
+#: pcbnew/swap_layers.cpp:70
 msgid "Swap Layers:"
 msgstr "Permutation Couches:"
 
-#: pcbnew/swap_layers.cpp:215
-#: pcbnew/swap_layers.cpp:220
-#: pcbnew/swap_layers.cpp:306
+#: pcbnew/swap_layers.cpp:217
+#: pcbnew/swap_layers.cpp:222
+#: pcbnew/swap_layers.cpp:308
 msgid "No Change"
 msgstr "Garder"
 
-#: pcbnew/swap_layers.cpp:296
+#: pcbnew/swap_layers.cpp:298
 msgid "Deselect this layer to select the No Change state"
 msgstr "Désélectionner cette couche pour restorer l'option Pas de Changement"
 
@@ -3362,26 +3362,6 @@ msgstr "Non"
 msgid " Yes"
 msgstr "Oui"
 
-#: pcbnew/moduleframe.cpp:255
-msgid "Module Editor: Module modified! Continue?"
-msgstr "Editeur de Module: Module modifié!  Continuer ?"
-
-#: pcbnew/moduleframe.cpp:363
-msgid "Display rectangular coordinates"
-msgstr "Affichage coord XY"
-
-#: pcbnew/moduleframe.cpp:371
-msgid "Show grid"
-msgstr "Afficher grille"
-
-#: pcbnew/moduleframe.cpp:383
-msgid "Show pads in sketch mode"
-msgstr "Afficher pads en mode contour"
-
-#: pcbnew/moduleframe.cpp:384
-msgid "Show pads in filled mode"
-msgstr "Afficher pads en mode plein"
-
 #: pcbnew/dialog_graphic_items_options.cpp:194
 msgid "Graphics:"
 msgstr "Eléments graphiques;"
@@ -3531,6 +3511,26 @@ msgstr "KeyW: "
 msgid "Netlist Selection:"
 msgstr "Sélection de la netliste"
 
+#: pcbnew/moduleframe.cpp:255
+msgid "Module Editor: Module modified! Continue?"
+msgstr "Editeur de Module: Module modifié!  Continuer ?"
+
+#: pcbnew/moduleframe.cpp:363
+msgid "Display rectangular coordinates"
+msgstr "Affichage coord XY"
+
+#: pcbnew/moduleframe.cpp:371
+msgid "Show grid"
+msgstr "Afficher grille"
+
+#: pcbnew/moduleframe.cpp:383
+msgid "Show pads in sketch mode"
+msgstr "Afficher pads en mode contour"
+
+#: pcbnew/moduleframe.cpp:384
+msgid "Show pads in filled mode"
+msgstr "Afficher pads en mode plein"
+
 #: pcbnew/dialog_print_using_printer_base.cpp:35
 msgid "Exclude Edges_Pcb Layer"
 msgstr "Exclure Couche Contours PCB"
@@ -3596,8 +3596,16 @@ msgid "Set Y scale adjust for exact scale plotting"
 msgstr "Ajuster échelle Y pour traçage à l'échelle exacte"
 
 #: pcbnew/dialog_print_using_printer_base.cpp:78
-msgid "Pen Width Mini"
-msgstr "Epaiss Plume Mini"
+msgid "Default Pen Size:"
+msgstr "Dimension Plume par Défaut:"
+
+#: pcbnew/dialog_print_using_printer_base.cpp:80
+msgid ""
+"Pen size used to draw items that have no pen size specified.\n"
+"Used mainly to draw items in sketch mode."
+msgstr ""
+"Diamètre de plume utilisé pour tracer les éléments qui n'ont pas de taille de trait spécifié.\n"
+"Utilisé principalement pour tracer les éléments en mode contour."
 
 #: pcbnew/dialog_print_using_printer_base.cpp:87
 msgid "Print frame ref"
@@ -5185,11 +5193,11 @@ msgstr "Mots Clés"
 msgid "inch"
 msgstr "Pouce"
 
-#: pcbnew/dialog_SVG_print.cpp:207
+#: pcbnew/dialog_SVG_print.cpp:206
 msgid "Create file "
 msgstr "Créer Fichier "
 
-#: pcbnew/dialog_SVG_print.cpp:209
+#: pcbnew/dialog_SVG_print.cpp:208
 msgid " error"
 msgstr " erreur"
 
@@ -5876,7 +5884,7 @@ msgstr "Net Code"
 msgid "Net Length"
 msgstr "Long. Net"
 
-#: pcbnew/dialog_print_for_modedit.cpp:239
+#: pcbnew/dialog_print_for_modedit.cpp:202
 msgid "Print Footprint"
 msgstr "Imprimer Module"
 
@@ -8310,6 +8318,10 @@ msgstr " Rien trouvé"
 msgid " in lib "
 msgstr " en libr. "
 
+#: eeschema/eeschema.cpp:135
+msgid "Eeschema is already running, Continue?"
+msgstr "Eeschema est en cours d'exécution. Continuer ?"
+
 #: eeschema/tool_sch.cpp:30
 #: eeschema/menubar.cpp:45
 msgid "New schematic project"
@@ -8460,10 +8472,6 @@ msgstr "Force direction H, V  pour les fils et bus"
 msgid "Save Project Settings"
 msgstr "Sauver Options Projet"
 
-#: eeschema/eeschema.cpp:131
-msgid "Eeschema is already running, Continue?"
-msgstr "Eeschema est en cours d'exécution. Continuer ?"
-
 #: eeschema/tool_viewlib.cpp:34
 msgid "Select library to browse"
 msgstr "Sélection de la librairie à examiner"
@@ -10179,23 +10187,23 @@ msgstr "Importer Composant"
 msgid "Component library file <%s> is empty."
 msgstr "Le fichier de composants <%s> est vide."
 
-#: eeschema/lib_export.cpp:99
+#: eeschema/lib_export.cpp:104
 msgid "There is no component selected to save."
 msgstr "Pas de composant sélectionné à sauver."
 
-#: eeschema/lib_export.cpp:106
+#: eeschema/lib_export.cpp:111
 msgid "New Library"
 msgstr "Nouvelle Librairie"
 
-#: eeschema/lib_export.cpp:106
+#: eeschema/lib_export.cpp:111
 msgid "Export Component"
 msgstr "Exporter Composant"
 
-#: eeschema/lib_export.cpp:132
+#: eeschema/lib_export.cpp:139
 msgid " - OK"
 msgstr " - OK"
 
-#: eeschema/lib_export.cpp:133
+#: eeschema/lib_export.cpp:140
 msgid ""
 "This library will not be available until it is loaded by EESchema.\n"
 "\n"
@@ -10205,7 +10213,11 @@ msgstr ""
 "\n"
 "Modifier la config de eeschema si vous voulez l'utiliser dans votre projet."
 
-#: eeschema/lib_export.cpp:138
+#: eeschema/lib_export.cpp:145
+msgid " - Export OK"
+msgstr " - Export OK"
+
+#: eeschema/lib_export.cpp:148
 msgid "Error creating "
 msgstr "Erreur en création de "
 
@@ -10937,6 +10949,22 @@ msgstr "Certains fichiers n'ont pas pu être trouvés!"
 msgid "Some files are invalid!"
 msgstr "Certains fichiers sont invalides!"
 
+#: cvpcb/cvpcb.cpp:32
+msgid "Kicad retroannotation files (*.stf)|*.stf"
+msgstr "Fichiers de retroannotaion  Kicad  (*.stf)|*.stf"
+
+#: cvpcb/cvpcb.cpp:33
+msgid "Kicad footprint alias files (*.equ)|*.equ"
+msgstr "Fichiers alias modules Kicad  (*.equ)|*.equ"
+
+#: cvpcb/cvpcb.cpp:100
+msgid "Cvpcb is already running, Continue?"
+msgstr "Cvpcb est en cours d'exécution. Continuer ?"
+
+#: cvpcb/cvpcb.cpp:142
+msgid " [no file]"
+msgstr " [pas de fichier]"
+
 #: cvpcb/menucfg.cpp:26
 msgid "&Open"
 msgstr "&Ouvrir "
@@ -11024,22 +11052,6 @@ msgstr "non nommé"
 msgid "Open Net List"
 msgstr "Ouvrir Fichier Netliste"
 
-#: cvpcb/cvpcb.cpp:32
-msgid "Kicad retroannotation files (*.stf)|*.stf"
-msgstr "Fichiers de retroannotaion  Kicad  (*.stf)|*.stf"
-
-#: cvpcb/cvpcb.cpp:33
-msgid "Kicad footprint alias files (*.equ)|*.equ"
-msgstr "Fichiers alias modules Kicad  (*.equ)|*.equ"
-
-#: cvpcb/cvpcb.cpp:97
-msgid "Cvpcb is already running, Continue?"
-msgstr "Cvpcb est en cours d'exécution. Continuer ?"
-
-#: cvpcb/cvpcb.cpp:139
-msgid " [no file]"
-msgstr " [pas de fichier]"
-
 #: cvpcb/setvisu.cpp:48
 msgid "Footprint: "
 msgstr "Module: "
@@ -11165,7 +11177,7 @@ msgid "File <"
 msgstr "Fichier <"
 
 #: cvpcb/readschematicnetlist.cpp:115
-#: kicad/prjconfig.cpp:105
+#: kicad/prjconfig.cpp:106
 msgid "> not found"
 msgstr ">  non trouvé"
 
@@ -11188,26 +11200,6 @@ msgstr "Erreur Netliste: %s"
 msgid "Component %s %s pin %s : Different Nets"
 msgstr "Composant %s %s pin %s :  Nets Différents"
 
-#: cvpcb/class_DisplayFootprintsFrame.cpp:156
-msgid "Display Options"
-msgstr "Options d'Affichage"
-
-#: cvpcb/class_DisplayFootprintsFrame.cpp:162
-msgid "Zoom in (F1)"
-msgstr "Zoom + (F1)"
-
-#: cvpcb/class_DisplayFootprintsFrame.cpp:166
-msgid "Zoom out (F2)"
-msgstr "Zoom - (F2)"
-
-#: cvpcb/class_DisplayFootprintsFrame.cpp:170
-msgid "Redraw view (F3)"
-msgstr "Redessin de l'écran (F3)"
-
-#: cvpcb/class_DisplayFootprintsFrame.cpp:174
-msgid "Zoom auto (Home)"
-msgstr "Zoom Automatique (Home)"
-
 #: cvpcb/tool_cvpcb.cpp:31
 msgid "Save net list and footprint files"
 msgstr "Sauver fichiers netliste et cmp"
@@ -11295,6 +11287,26 @@ msgstr "&Appliquer"
 msgid "Footprint alias files"
 msgstr "Fichier Alias Modules"
 
+#: cvpcb/class_DisplayFootprintsFrame.cpp:156
+msgid "Display Options"
+msgstr "Options d'Affichage"
+
+#: cvpcb/class_DisplayFootprintsFrame.cpp:162
+msgid "Zoom in (F1)"
+msgstr "Zoom + (F1)"
+
+#: cvpcb/class_DisplayFootprintsFrame.cpp:166
+msgid "Zoom out (F2)"
+msgstr "Zoom - (F2)"
+
+#: cvpcb/class_DisplayFootprintsFrame.cpp:170
+msgid "Redraw view (F3)"
+msgstr "Redessin de l'écran (F3)"
+
+#: cvpcb/class_DisplayFootprintsFrame.cpp:174
+msgid "Zoom auto (Home)"
+msgstr "Zoom Automatique (Home)"
+
 #: kicad/menubar.cpp:94
 msgid "Open an existing project"
 msgstr "Ouvrir un projet  existant"
@@ -11402,29 +11414,29 @@ msgstr "Archiver les fichiers du projet"
 msgid "Refresh project tree"
 msgstr "Mettre à jour l'affichage du projet"
 
-#: kicad/prjconfig.cpp:41
+#: kicad/prjconfig.cpp:42
 msgid "Project template file <kicad.pro> not found "
 msgstr "Fichier modèle <kicad.pro> non trouvé"
 
-#: kicad/prjconfig.cpp:72
+#: kicad/prjconfig.cpp:73
 msgid "Create New Project"
 msgstr "Créer un Nouveau Projet"
 
-#: kicad/prjconfig.cpp:77
+#: kicad/prjconfig.cpp:78
 msgid "Open Existing Project"
 msgstr "Ouvrir un Projet  Existant"
 
-#: kicad/prjconfig.cpp:104
+#: kicad/prjconfig.cpp:105
 msgid "Kicad project file <"
 msgstr "Fichier projet Kicad <"
 
-#: kicad/prjconfig.cpp:118
-#: kicad/kicad.cpp:78
+#: kicad/prjconfig.cpp:119
+#: kicad/kicad.cpp:74
 msgid "Working dir: "
 msgstr "Répertoire de travail: "
 
-#: kicad/prjconfig.cpp:119
-#: kicad/kicad.cpp:79
+#: kicad/prjconfig.cpp:120
+#: kicad/kicad.cpp:75
 msgid ""
 "\n"
 "Project: "
@@ -11432,7 +11444,7 @@ msgstr ""
 "\n"
 "Projet: "
 
-#: kicad/kicad.cpp:106
+#: kicad/kicad.cpp:102
 msgid "noname"
 msgstr "noname"
 
@@ -11485,7 +11497,7 @@ msgstr ""
 "\n"
 "Créer Archive zippée <%s>"
 
-#: kicad/mainframe.cpp:71
+#: kicad/mainframe.cpp:72
 #, c-format
 msgid ""
 "Ready\n"
@@ -11494,19 +11506,19 @@ msgstr ""
 "Prêt\n"
 "Répertoire de travail: %s\n"
 
-#: kicad/mainframe.cpp:230
+#: kicad/mainframe.cpp:231
 msgid "Execute Python Script"
 msgstr "Executer un Script Python"
 
-#: kicad/mainframe.cpp:231
+#: kicad/mainframe.cpp:232
 msgid "Python script (*.py)|*.py"
 msgstr "Script Python (*.py)|*.py"
 
-#: kicad/mainframe.cpp:252
+#: kicad/mainframe.cpp:253
 msgid "Text file ("
 msgstr "Fichier Texte ("
 
-#: kicad/mainframe.cpp:254
+#: kicad/mainframe.cpp:255
 msgid "Load File to Edit"
 msgstr "Fichier à Editer"
 
@@ -11530,43 +11542,6 @@ msgstr "GerbView (Visualisateur  Gerber)"
 msgid "Run Python Script"
 msgstr "Exécuter le Script Python"
 
-#: kicad/treeprj_datas.cpp:207
-msgid "Unable to move file ... "
-msgstr "Impossible de déplacer le fichier "
-
-#: kicad/treeprj_datas.cpp:208
-#: kicad/treeprj_datas.cpp:289
-msgid "Permission error ?"
-msgstr "Erreur de permission ?"
-
-#: kicad/treeprj_datas.cpp:272
-msgid ""
-"Changing file extension will change file type.\n"
-" Do you want to continue ?"
-msgstr ""
-"Changer l'extension changera le type de fichier.\n"
-"Voulez vous continuer ?"
-
-#: kicad/treeprj_datas.cpp:274
-msgid "Rename File"
-msgstr "Renommer Fichier"
-
-#: kicad/treeprj_datas.cpp:288
-msgid "Unable to rename file ... "
-msgstr "Impossible de renommer le fichier... "
-
-#: kicad/treeprj_datas.cpp:309
-msgid "Do you really want to delete "
-msgstr "Voulez vous réellement effacer"
-
-#: kicad/treeprj_datas.cpp:310
-msgid "Delete File"
-msgstr "Supprimer Fichier"
-
-#: kicad/treeprj_datas.cpp:381
-msgid "no kicad files found in this directory"
-msgstr "Pas de fichier Kicad trouvé dans ce répertoire"
-
 #: kicad/preferences.cpp:47
 msgid "You must choose a PDF viewer before using this option."
 msgstr "Vous devez choisir un Visualisateur PDF avant d'utiliser cette option."
@@ -11587,108 +11562,125 @@ msgstr "Fichier exécutable ("
 msgid "Select Prefered Editor"
 msgstr "Sélection Editeur Préféré"
 
-#: kicad/treeprj_frame.cpp:136
+#: kicad/tree_project_frame.cpp:157
 msgid "&Run"
 msgstr "Exécute&r"
 
-#: kicad/treeprj_frame.cpp:137
+#: kicad/tree_project_frame.cpp:158
 msgid "Run the Python Script"
 msgstr "Exécuter le Script Python"
 
-#: kicad/treeprj_frame.cpp:146
-#: kicad/treeprj_frame.cpp:221
+#: kicad/tree_project_frame.cpp:167
+#: kicad/tree_project_frame.cpp:224
 msgid "&Edit in a text editor"
 msgstr "Editer avec un éditeur de Texte"
 
-#: kicad/treeprj_frame.cpp:147
+#: kicad/tree_project_frame.cpp:168
 msgid "&Open the file in a Text Editor"
 msgstr "&Ouvrir le fichier avec un  Editeur de texte"
 
-#: kicad/treeprj_frame.cpp:164
+#: kicad/tree_project_frame.cpp:185
 msgid "New D&irectory"
 msgstr "&Nouveau Répertoire"
 
-#: kicad/treeprj_frame.cpp:165
+#: kicad/tree_project_frame.cpp:186
 msgid "Create a New Directory"
 msgstr "Créer un nouveau Répertoire"
 
-#: kicad/treeprj_frame.cpp:174
+#: kicad/tree_project_frame.cpp:195
 msgid "New P&ython Script"
 msgstr "Nouveau Script P&ython"
 
-#: kicad/treeprj_frame.cpp:175
+#: kicad/tree_project_frame.cpp:196
 msgid "Create a New Python Script"
 msgstr "Créer un nouveau script Python"
 
-#: kicad/treeprj_frame.cpp:184
-msgid "New &Text File"
-msgstr "Nouveau  Fichier &Texte"
-
-#: kicad/treeprj_frame.cpp:185
-msgid "Create a New Txt File"
-msgstr "Créer un nouveau Fichier texte"
-
-#: kicad/treeprj_frame.cpp:193
-msgid "New &File"
-msgstr "Nouveau &Fichier"
-
-#: kicad/treeprj_frame.cpp:194
-msgid "Create a New File"
-msgstr "Créer un nouveau Fichier"
-
-#: kicad/treeprj_frame.cpp:208
+#: kicad/tree_project_frame.cpp:211
 msgid "&Rename file"
 msgstr "&Renommer fichier"
 
-#: kicad/treeprj_frame.cpp:209
-#: kicad/treeprj_frame.cpp:211
+#: kicad/tree_project_frame.cpp:212
+#: kicad/tree_project_frame.cpp:214
 msgid "&Rename directory"
 msgstr "&Renommer répertoire"
 
-#: kicad/treeprj_frame.cpp:210
+#: kicad/tree_project_frame.cpp:213
 msgid "Rename file"
 msgstr "Renommer fichier"
 
-#: kicad/treeprj_frame.cpp:222
+#: kicad/tree_project_frame.cpp:225
 msgid "Open the file in a Text Editor"
 msgstr "Ouvrir le fichier avec un  Editeur de texte"
 
-#: kicad/treeprj_frame.cpp:230
+#: kicad/tree_project_frame.cpp:233
 msgid "&Delete File"
 msgstr "&Supprimer Fichier"
 
-#: kicad/treeprj_frame.cpp:231
+#: kicad/tree_project_frame.cpp:234
 msgid "&Delete Directory"
 msgstr "&Supprimer le Répertoire"
 
-#: kicad/treeprj_frame.cpp:232
+#: kicad/tree_project_frame.cpp:235
 msgid "Delete the File"
 msgstr "Supprimer le fichier"
 
-#: kicad/treeprj_frame.cpp:233
+#: kicad/tree_project_frame.cpp:236
 msgid "&Delete the Directory and its content"
 msgstr "Effacer le Répertoire et son contenu"
 
-#: kicad/treeprj_frame.cpp:559
+#: kicad/tree_project_frame.cpp:511
 msgid "Create New File"
 msgstr "Créer  un Nouveau Fichier"
 
-#: kicad/treeprj_frame.cpp:560
+#: kicad/tree_project_frame.cpp:512
 msgid "Create New Directory"
 msgstr "Créer un nouveau Répertoire"
 
-#: kicad/treeprj_frame.cpp:569
+#: kicad/tree_project_frame.cpp:521
 msgid "noname."
 msgstr "noname."
 
-#: kicad/treeprj_frame.cpp:1109
+#: kicad/tree_project_frame.cpp:1055
 msgid "Change filename: "
 msgstr "Changer Nom Fichier: "
 
-#: kicad/treeprj_frame.cpp:1111
+#: kicad/tree_project_frame.cpp:1057
 msgid "Change filename"
 msgstr "Changer Nom Fichier"
 
+#: kicad/class_treeproject_item.cpp:148
+msgid "Unable to move file ... "
+msgstr "Impossible de déplacer le fichier "
+
+#: kicad/class_treeproject_item.cpp:149
+#: kicad/class_treeproject_item.cpp:230
+msgid "Permission error ?"
+msgstr "Erreur de permission ?"
+
+#: kicad/class_treeproject_item.cpp:213
+msgid ""
+"Changing file extension will change file type.\n"
+" Do you want to continue ?"
+msgstr ""
+"Changer l'extension changera le type de fichier.\n"
+"Voulez vous continuer ?"
+
+#: kicad/class_treeproject_item.cpp:215
+msgid "Rename File"
+msgstr "Renommer Fichier"
+
+#: kicad/class_treeproject_item.cpp:229
+msgid "Unable to rename file ... "
+msgstr "Impossible de renommer le fichier... "
+
+#: kicad/class_treeproject_item.cpp:250
+msgid "Do you really want to delete "
+msgstr "Voulez vous réellement effacer"
+
+#: kicad/class_treeproject_item.cpp:251
+msgid "Delete File"
+msgstr "Supprimer Fichier"
+
 #: gerbview/options.cpp:167
 msgid "Gerbview Options"
 msgstr "Gerbview Options "
@@ -11831,6 +11823,14 @@ msgstr "Commande <%c%c> ignorée par Gerbview"
 msgid "Too many include files!!"
 msgstr "Trop de fichiers inclus!!"
 
+#: gerbview/gerbview.cpp:40
+msgid "GerbView project files (.cnf)|*.cnf"
+msgstr "Fichiers projet GerbView (.cnf)|*.cnf"
+
+#: gerbview/gerbview.cpp:97
+msgid "GerbView is already running. Continue?"
+msgstr "Gerbview est en cours d'exécution. Continuer ?"
+
 #: gerbview/dcode.cpp:476
 msgid "List D codes"
 msgstr "Liste D-Codes"
@@ -11844,14 +11844,6 @@ msgstr "Les données courante seront perdues ?"
 msgid "Delete layer %d?"
 msgstr "Effacer couche %d"
 
-#: gerbview/gerbview.cpp:40
-msgid "GerbView project files (.cnf)|*.cnf"
-msgstr "Fichiers projet GerbView (.cnf)|*.cnf"
-
-#: gerbview/gerbview.cpp:92
-msgid "GerbView is already running. Continue?"
-msgstr "Gerbview est en cours d'exécution. Continuer ?"
-
 #: gerbview/select_layers_to_pcb.cpp:213
 #: gerbview/tool_gerber.cpp:209
 msgid "Layer "
@@ -12208,14 +12200,6 @@ msgstr "Couleurs"
 msgid "Error"
 msgstr "Erreur"
 
-#: common/richio.cpp:67
-msgid "Line length exceeded"
-msgstr "Longueur de ligne dépassée"
-
-#: common/richio.cpp:177
-msgid "Error writing to STRINGFORMATTER"
-msgstr "Erreur d'écriture à STRINGFORMATTER"
-
 #: common/zoom.cpp:185
 msgid "Center"
 msgstr "Centrer"
@@ -12232,6 +12216,14 @@ msgstr "Zoom:  "
 msgid "Grid Select"
 msgstr "Sélection Grille"
 
+#: common/richio.cpp:67
+msgid "Line length exceeded"
+msgstr "Longueur de ligne dépassée"
+
+#: common/richio.cpp:177
+msgid "Error writing to STRINGFORMATTER"
+msgstr "Erreur d'écriture à STRINGFORMATTER"
+
 #: common/eda_doc.cpp:149
 msgid "Doc File "
 msgstr "Fichier de Doc "
@@ -12325,6 +12317,27 @@ msgstr "Langue"
 msgid "Select application language (only for testing!)"
 msgstr "Choisir la langue (seulement pour tests!)"
 
+#: common/dsnlexer.cpp:168
+msgid "in file"
+msgstr "dans le fichier"
+
+#: common/dsnlexer.cpp:169
+msgid "on line"
+msgstr "en ligne"
+
+#: common/dsnlexer.cpp:170
+msgid "at offset"
+msgstr "à l'offset"
+
+#: common/dsnlexer.cpp:246
+msgid "String delimiter must be a single character of ', \", or $"
+msgstr "Le caractère de délimitation de ligne doit être un seul caractère  ', \", or $"
+
+#: common/dsnlexer.cpp:361
+#: common/dsnlexer.cpp:374
+msgid "Un-terminated delimited string"
+msgstr "Ligne délimitée non terminée"
+
 #: common/common.cpp:60
 msgid "Kicad project files (*.pro)|*.pro"
 msgstr "Fichiers projet Kicad  (*.pro)|*.pro"
@@ -12373,26 +12386,6 @@ msgstr "Inconnu"
 msgid " \""
 msgstr " \""
 
-#: common/dsnlexer.cpp:167
-msgid "in file"
-msgstr "dans le fichier"
-
-#: common/dsnlexer.cpp:168
-msgid "on line"
-msgstr "en ligne"
-
-#: common/dsnlexer.cpp:169
-msgid "at offset"
-msgstr "à l'offset"
-
-#: common/dsnlexer.cpp:231
-msgid "String delimiter must be a single character of ', \", or $"
-msgstr "Le caractère de délimitation de ligne doit être un seul caractère  ', \", or $"
-
-#: common/dsnlexer.cpp:315
-msgid "Un-terminated delimited string"
-msgstr "Ligne délimitée non terminée"
-
 #: common/basicframe.cpp:207
 msgid " file <"
 msgstr " Fichier <"
@@ -12411,6 +12404,10 @@ msgstr "Fichier d'aide %s non trouvé"
 msgid "Help file %s could not be found."
 msgstr "Fichier d'aide %s non trouvé."
 
+#: common/drawframe.cpp:336
+msgid "??"
+msgstr "??"
+
 #: common/block_commande.cpp:47
 msgid "Block Move"
 msgstr "Déplace Bloc"
@@ -12451,10 +12448,6 @@ msgstr "Retournement Bloc"
 msgid "Block Mirror"
 msgstr "Bloc Miroir"
 
-#: common/drawframe.cpp:330
-msgid "??"
-msgstr "??"
-
 #: common/get_component_dialog.cpp:70
 msgid "History list:"
 msgstr "Historique:"
@@ -13022,6 +13015,18 @@ msgstr "Options d'Affichage"
 msgid "Page Settings"
 msgstr "Ajustage opt Page"
 
+#~ msgid "Pen Width Mini"
+#~ msgstr "Epaiss Plume Mini"
+#~ msgid "no kicad files found in this directory"
+#~ msgstr "Pas de fichier Kicad trouvé dans ce répertoire"
+#~ msgid "New &Text File"
+#~ msgstr "Nouveau  Fichier &Texte"
+#~ msgid "Create a New Txt File"
+#~ msgstr "Créer un nouveau Fichier texte"
+#~ msgid "New &File"
+#~ msgstr "Nouveau &Fichier"
+#~ msgid "Create a New File"
+#~ msgstr "Créer un nouveau Fichier"
 #~ msgid "Net name"
 #~ msgstr "Net Name"
 #~ msgid "Alias <%s> not found for component <%s> in library <%s>."
diff --git a/packaging/windows/nsis/install.nsi b/packaging/windows/nsis/install.nsi
index c4f4fc4505..7bdd0c4967 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 "2009.02.16"
+!define PRODUCT_VERSION "2010.02.21"
 !define PRODUCT_WEB_SITE "http://iut-tice.ujf-grenoble.fr/kicad/"
 !define SOURCEFORGE_WEB_SITE "http://kicad.sourceforge.net/"
 !define COMPANY_NAME ""