diff --git a/common/hotkeys_basic.cpp b/common/hotkeys_basic.cpp
index e51b41c5e0..5e111b6fd0 100644
--- a/common/hotkeys_basic.cpp
+++ b/common/hotkeys_basic.cpp
@@ -598,20 +598,29 @@ wxString    ReturnHotkeyConfigFilePath( int choice )
 void AddHotkeyConfigMenu( wxMenu* menu )
 /***************************************/
 
-/* add hotkey config options to a menu
- * @parm menu : initial menu
+/** add hotkey config options to a menu
+ * @param menu : initial menu
  */
 {
     wxMenuItem* item;
 
     if( menu == NULL )
         return;
+
+    item = new wxMenuItem( menu, ID_PREFERENCES_HOTKEY_SHOW_CURRENT_LIST,
+                           _( "Show Current Hotkey List" ),
+                           _( "Show the current hotkey config" )
+                           );
+    item->SetBitmap( info_xpm );
+    menu->Append( item );
+
     item = new wxMenuItem( menu, ID_PREFERENCES_CREATE_CONFIG_HOTKEYS,
                            _( "Create Hotkey config file" ),
                            _( "Create or Recreate the hotkey config file from current hotkey list" )
                            );
     item->SetBitmap( save_setup_xpm );
     menu->Append( item );
+
     item = new wxMenuItem( menu, ID_PREFERENCES_READ_CONFIG_HOTKEYS,
                           _( "Reread Hotkey config file" ),
                           _( "Reread the hotkey config file" ) );
diff --git a/eeschema/eeconfig.cpp b/eeschema/eeconfig.cpp
index d53b928912..dd09d54a63 100644
--- a/eeschema/eeconfig.cpp
+++ b/eeschema/eeconfig.cpp
@@ -101,6 +101,10 @@ wxString FullFileName;
 			HandleHotkeyConfigMenuSelection( this, id );
 			break;
 
+		case ID_PREFERENCES_HOTKEY_SHOW_CURRENT_LIST:       // Display Current hotkey list for eeschema
+			DisplayHotkeyList( this, s_Schematic_Hokeys_Descr );
+			break;
+
 		default:
 			DisplayError(this, wxT("WinEDA_SchematicFrame::Process_Config internal error") );
 	}
diff --git a/include/build_version.h b/include/build_version.h
index d2f39577d3..8f48dc2fc4 100644
--- a/include/build_version.h
+++ b/include/build_version.h
@@ -5,7 +5,7 @@
 
 COMMON_GLOBL wxString g_BuildVersion
 #ifdef EDA_BASE
-	(wxT("(2007-11-09)"))
+	(wxT("(2007-11-14)"))
 #endif
 ;
 
diff --git a/include/id.h b/include/id.h
index 07de7d4767..b0677972bc 100644
--- a/include/id.h
+++ b/include/id.h
@@ -72,7 +72,7 @@ enum main_id {
 	ID_PREFERENCES_EDIT_CONFIG_HOTKEYS,
 	ID_PREFERENCES_HOTKEY_PATH_IS_HOME,
 	ID_PREFERENCES_HOTKEY_PATH_IS_KICAD,
-	ID_PREFERENCES_UNUSED1,
+	ID_PREFERENCES_HOTKEY_SHOW_CURRENT_LIST,
 	ID_PREFERENCES_UNUSED2,
 	ID_PREFERENCES_UNUSED3,
 	ID_CONFIG_AND_PREFERENCES_END,
diff --git a/internat/fr/kicad.mo b/internat/fr/kicad.mo
index d8980cca21..5baf9da71c 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 5e13ba942c..846d1ac88d 100644
--- a/internat/fr/kicad.po
+++ b/internat/fr/kicad.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: kicad\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2007-11-10 16:01+0100\n"
-"Last-Translator: \n"
+"PO-Revision-Date: 2007-11-14 16:56+0100\n"
+"Last-Translator: jp charras <jean-pierre.charras@inpg.fr>\n"
 "Language-Team: kicad team <jean-pierre.charras@ujf-grenoble.fr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
@@ -89,58 +89,6 @@ msgstr "Fichier"
 msgid "Selection Clarification"
 msgstr "Clarification de la S�lection"
 
-#: pcbnew/modedit.cpp:263
-msgid "Unable to find the footprint source on the main board"
-msgstr "Impossible de trouver le module source sur le PCB principal"
-
-#: pcbnew/modedit.cpp:264
-msgid ""
-"\n"
-"Cannot update the footprint"
-msgstr ""
-"\n"
-"Ne peut mettre � jour le module"
-
-#: pcbnew/modedit.cpp:272
-msgid "A footprint source was found on the main board"
-msgstr "Un module source a �t� trouv� sur le PCB principal"
-
-#: pcbnew/modedit.cpp:273
-msgid ""
-"\n"
-"Cannot insert this footprint"
-msgstr ""
-"\n"
-"Ne peut ins�rer cd module"
-
-#: pcbnew/modedit.cpp:395
-msgid "Add Pad"
-msgstr "Ajouter Pastilles"
-
-#: pcbnew/modedit.cpp:398
-#: pcbnew/tool_modedit.cpp:133
-#: pcbnew/menubarmodedit.cpp:45
-#: pcbnew/menubarpcb.cpp:209
-msgid "Pad Settings"
-msgstr "Caract pads"
-
-#: pcbnew/modedit.cpp:408
-#: eeschema/schedit.cpp:298
-msgid "Add Drawing"
-msgstr "Ajout d'�l�ments graphiques"
-
-#: pcbnew/modedit.cpp:412
-#: pcbnew/tool_modedit.cpp:185
-msgid "Place anchor"
-msgstr "Place Ancre"
-
-#: pcbnew/modedit.cpp:426
-#: pcbnew/edit.cpp:461
-#: eeschema/schedit.cpp:454
-#: eeschema/libframe.cpp:579
-msgid "Delete item"
-msgstr "Suppression d'�l�ments"
-
 #: pcbnew/librairi.cpp:48
 msgid "Import Module:"
 msgstr "Importer Module:"
@@ -193,7 +141,6 @@ msgstr "Librairie "
 
 #: pcbnew/librairi.cpp:203
 #: pcbnew/files.cpp:57
-#: eeschema/libedit.cpp:113
 #: eeschema/find.cpp:250
 #: eeschema/find.cpp:258
 #: eeschema/find.cpp:699
@@ -251,8 +198,6 @@ msgid "Module exists Line "
 msgstr "Module existe Ligne "
 
 #: pcbnew/librairi.cpp:642
-#: eeschema/libedit.cpp:113
-#: eeschema/libedit.cpp:390
 msgid "Component "
 msgstr "Composant"
 
@@ -486,7 +431,7 @@ msgstr "Tst Pistes\n"
 
 #: pcbnew/drc.cpp:361
 #: pcbnew/drc.cpp:439
-#: eeschema/eelayer.h:103
+#: eeschema/eelayer.h:104
 msgid "Netname"
 msgstr "NetName"
 
@@ -634,8 +579,8 @@ msgstr "Origine des coord de percage:"
 
 #: pcbnew/gendrill.cpp:222
 #: pcbnew/gendrill.cpp:230
-#: eeschema/libedit.cpp:41
 #: eeschema/viewlibs.cpp:120
+#: eeschema/libedit.cpp:41
 msgid "None"
 msgstr "Aucun"
 
@@ -685,8 +630,6 @@ msgid "&Execute"
 msgstr "&Ex�cuter"
 
 #: pcbnew/gendrill.cpp:263
-#: pcbnew/dialog_netlist.cpp:178
-#: pcbnew/dialog_drc.cpp:201
 #: eeschema/plotps.cpp:208
 #: share/dialog_print.cpp:225
 #: share/svg_print.cpp:222
@@ -802,8 +745,8 @@ msgid "Net Code"
 msgstr "Net Code"
 
 #: pcbnew/affiche.cpp:52
-#: pcbnew/class_board.cpp:304
 #: pcbnew/class_module.cpp:1228
+#: pcbnew/class_board.cpp:304
 msgid "Pads"
 msgstr "Pads"
 
@@ -822,7 +765,7 @@ msgid "Include tracks"
 msgstr "Inclure Pistes"
 
 #: pcbnew/block.cpp:133
-#: pcbnew/dialog_drc.cpp:165
+#: pcbnew/dialog_drc.cpp:171
 msgid "Include zones"
 msgstr "Inclure zones"
 
@@ -853,20 +796,19 @@ msgstr "Inclure couche Edge"
 #: pcbnew/sel_layer.cpp:162
 #: pcbnew/sel_layer.cpp:320
 #: eeschema/sheetlab.cpp:97
-#: eeschema/eelayer.cpp:252
+#: eeschema/eelayer.cpp:255
 #: eeschema/libedit_onrightclick.cpp:68
 #: eeschema/libedit_onrightclick.cpp:83
 #: eeschema/onrightclick.cpp:121
 #: eeschema/onrightclick.cpp:133
-#: gerbview/set_color.cpp:253
 #: gerbview/options.cpp:169
 #: gerbview/options.cpp:293
 #: gerbview/reglage.cpp:112
 #: gerbview/onrightclick.cpp:40
 #: gerbview/onrightclick.cpp:59
+#: gerbview/set_color.cpp:329
+#: common/selcolor.cpp:171
 #: common/displlst.cpp:103
-#: common/selcolor.cpp:169
-#: common/selcolor.cpp:186
 #: common/get_component_dialog.cpp:121
 msgid "Cancel"
 msgstr "Annuler"
@@ -881,13 +823,12 @@ msgstr "Annuler"
 #: pcbnew/sel_layer.cpp:158
 #: pcbnew/sel_layer.cpp:316
 #: eeschema/sheetlab.cpp:93
-#: eeschema/eelayer.cpp:248
-#: gerbview/set_color.cpp:249
+#: eeschema/eelayer.cpp:251
 #: gerbview/options.cpp:165
 #: gerbview/options.cpp:289
 #: gerbview/reglage.cpp:108
+#: gerbview/set_color.cpp:325
 #: common/displlst.cpp:99
-#: common/selcolor.cpp:165
 #: common/get_component_dialog.cpp:112
 msgid "OK"
 msgstr "OK"
@@ -1040,33 +981,36 @@ msgstr "Offset Y"
 #: pcbnew/dialog_pad_edit.cpp:217
 #: pcbnew/dialog_general_options.cpp:368
 #: pcbnew/dialog_graphic_items_options.cpp:261
+#: pcbnew/dialog_drc.cpp:232
 #: pcbnew/swap_layers.cpp:219
 #: pcbnew/dialog_track_options.cpp:181
 #: eeschema/symbtext.cpp:174
 #: eeschema/sheet.cpp:221
 #: eeschema/dialog_options.cpp:274
 #: eeschema/dialog_edit_label.cpp:174
-#: eeschema/dialog_edit_component_in_lib.cpp:218
 #: eeschema/dialog_create_component.cpp:195
 #: eeschema/dialog_cmp_graphic_properties.cpp:178
 #: eeschema/dialog_build_BOM.cpp:346
 #: eeschema/dialog_edit_component_in_schematic.cpp:240
+#: eeschema/dialog_edit_component_in_lib.cpp:218
 #: eeschema/pinedit-dialog.cpp:308
 #: cvpcb/dialog_cvpcb_config.cpp:139
 #: cvpcb/dialog_display_options.cpp:186
 #: gerbview/select_layers_to_pcb.cpp:283
-#: share/setpage.cpp:232
+#: share/setpage.cpp:442
 msgid "&OK"
 msgstr "&OK"
 
 #: pcbnew/dialog_edit_mod_text.cpp:217
 #: pcbnew/dialog_initpcb.cpp:164
 #: pcbnew/dialog_display_options.cpp:286
-#: pcbnew/zones.cpp:217
+#: pcbnew/dialog_netlist.cpp:189
 #: pcbnew/set_grid.cpp:176
 #: pcbnew/dialog_pad_edit.cpp:221
+#: pcbnew/zones.cpp:217
 #: pcbnew/dialog_general_options.cpp:372
 #: pcbnew/dialog_graphic_items_options.cpp:265
+#: pcbnew/dialog_drc.cpp:236
 #: pcbnew/swap_layers.cpp:223
 #: pcbnew/dialog_track_options.cpp:185
 #: eeschema/symbtext.cpp:178
@@ -1075,7 +1019,6 @@ msgstr "&OK"
 #: eeschema/sheet.cpp:216
 #: eeschema/dialog_options.cpp:278
 #: eeschema/dialog_edit_label.cpp:179
-#: eeschema/dialog_edit_component_in_lib.cpp:214
 #: eeschema/dialog_create_component.cpp:200
 #: eeschema/netlist_control.cpp:251
 #: eeschema/netlist_control.cpp:375
@@ -1083,10 +1026,11 @@ msgstr "&OK"
 #: eeschema/dialog_build_BOM.cpp:350
 #: eeschema/dialog_erc.cpp:218
 #: eeschema/dialog_edit_component_in_schematic.cpp:232
+#: eeschema/dialog_edit_component_in_lib.cpp:214
 #: eeschema/pinedit-dialog.cpp:304
 #: cvpcb/dialog_display_options.cpp:191
 #: gerbview/select_layers_to_pcb.cpp:287
-#: share/setpage.cpp:237
+#: share/setpage.cpp:446
 msgid "&Cancel"
 msgstr "&Annuler"
 
@@ -1223,69 +1167,6 @@ msgstr "Editer TOUTES Pistes"
 msgid "Delete NET ?"
 msgstr "Supprimer Net ?"
 
-#: pcbnew/dialog_netlist.cpp:133
-#: pcbnew/class_board_item.cpp:76
-#: eeschema/dialog_create_component.cpp:164
-#: eeschema/edit_component_in_schematic.cpp:745
-#: eeschema/onrightclick.cpp:317
-#: eeschema/eelayer.h:152
-msgid "Reference"
-msgstr "R�f�rence"
-
-#: pcbnew/dialog_netlist.cpp:134
-msgid "Timestamp"
-msgstr "Timestamp"
-
-#: pcbnew/dialog_netlist.cpp:136
-msgid "Module Selection:"
-msgstr "S�lection module"
-
-#: pcbnew/dialog_netlist.cpp:140
-#: pcbnew/dialog_netlist.cpp:147
-msgid "Keep"
-msgstr "Garder"
-
-#: pcbnew/dialog_netlist.cpp:141
-#: pcbnew/onrightclick.cpp:598
-#: pcbnew/onrightclick.cpp:708
-#: pcbnew/onrightclick.cpp:805
-#: eeschema/edit_component_in_lib.cpp:239
-#: eeschema/edit_component_in_lib.cpp:320
-msgid "Delete"
-msgstr "Supprimer"
-
-#: pcbnew/dialog_netlist.cpp:143
-msgid "Bad Tracks Deletion:"
-msgstr "Supp. pistes err.:"
-
-#: pcbnew/dialog_netlist.cpp:148
-msgid "Change"
-msgstr "Changer"
-
-#: pcbnew/dialog_netlist.cpp:150
-msgid "Exchange Module:"
-msgstr "Echange module:"
-
-#: pcbnew/dialog_netlist.cpp:153
-msgid "Display Warnings"
-msgstr "Affiche warnings"
-
-#: pcbnew/dialog_netlist.cpp:162
-msgid "Select"
-msgstr "S�lection"
-
-#: pcbnew/dialog_netlist.cpp:166
-msgid "Read"
-msgstr "Lire"
-
-#: pcbnew/dialog_netlist.cpp:170
-msgid "Module Test"
-msgstr "Test Modules"
-
-#: pcbnew/dialog_netlist.cpp:174
-msgid "Compile"
-msgstr "Compile"
-
 #: pcbnew/pcbframe.cpp:262
 msgid "Board modified, Save before exit ?"
 msgstr "Circuit Imprim� modifi�e,  Sauver avant de quitter ?"
@@ -1670,8 +1551,8 @@ msgstr "Zoom "
 #: pcbnew/tool_pcb.cpp:585
 #: eeschema/eelayer.cpp:223
 #: pcbnew/set_color.h:414
-#: eeschema/eelayer.h:209
-#: gerbview/set_color.h:246
+#: eeschema/eelayer.h:210
+#: gerbview/set_color.h:324
 msgid "Grid"
 msgstr "Grille"
 
@@ -1813,13 +1694,22 @@ msgstr " sur "
 msgid "Pcb Text"
 msgstr "Texte Pcb"
 
+#: pcbnew/class_board_item.cpp:76
+#: pcbnew/dialog_netlist.cpp:135
+#: eeschema/dialog_create_component.cpp:164
+#: eeschema/edit_component_in_schematic.cpp:745
+#: eeschema/onrightclick.cpp:317
+#: eeschema/eelayer.h:153
+msgid "Reference"
+msgstr "R�f�rence"
+
 #: pcbnew/class_board_item.cpp:80
 #: pcbnew/class_text_mod.cpp:345
 #: pcbnew/class_edge_mod.cpp:286
 #: eeschema/edit_component_in_schematic.cpp:784
 #: eeschema/component_class.cpp:55
 #: eeschema/onrightclick.cpp:316
-#: eeschema/eelayer.h:158
+#: eeschema/eelayer.h:159
 msgid "Value"
 msgstr "Valeur"
 
@@ -2042,91 +1932,6 @@ msgstr "Miroir"
 msgid "Layer:"
 msgstr "Couche:"
 
-#: pcbnew/zones.cpp:153
-#: pcbnew/zones.cpp:154
-#: pcbnew/zones.cpp:155
-#: pcbnew/zones.cpp:156
-msgid "0.00000"
-msgstr "0.00000"
-
-#: pcbnew/zones.cpp:160
-msgid "Grid size:"
-msgstr "Dim Grille"
-
-#: pcbnew/zones.cpp:165
-msgid "Zone clearance value (mm):"
-msgstr "Valeur isolation zone (mm):"
-
-#: pcbnew/zones.cpp:182
-msgid "Include Pads"
-msgstr "Inclure Pads"
-
-#: pcbnew/zones.cpp:183
-msgid "Thermal"
-msgstr "Thermique"
-
-#: pcbnew/zones.cpp:184
-msgid "Exclude Pads"
-msgstr "Exclure Pads"
-
-#: pcbnew/zones.cpp:188
-msgid "Pad options:"
-msgstr "Options pads"
-
-#: pcbnew/zones.cpp:193
-#: eeschema/dialog_options.cpp:257
-msgid "Any"
-msgstr "Tout"
-
-#: pcbnew/zones.cpp:194
-msgid "H , V and 45 deg"
-msgstr "H, V et 45  deg"
-
-#: pcbnew/zones.cpp:198
-msgid "Zone edges orient:"
-msgstr "Direction contours zone:"
-
-#: pcbnew/zones.cpp:210
-msgid "Fill"
-msgstr "Remplissage"
-
-#: pcbnew/zones.cpp:224
-msgid "Update Options"
-msgstr "Maj Options"
-
-#: pcbnew/zones.cpp:233
-msgid "Zone clearance value:"
-msgstr "Valeur isolation zone:"
-
-#: pcbnew/zones.cpp:236
-msgid "Grid :"
-msgstr "Grille:"
-
-#: pcbnew/zones.cpp:399
-msgid "New zone segment width: "
-msgstr "Nouvelle largeur des segments zone:"
-
-#: pcbnew/zones.cpp:594
-msgid "Zone: No net selected"
-msgstr "Zone: Net non s�lectionn�"
-
-#: pcbnew/zones.cpp:636
-msgid "Delete Current Zone Edges"
-msgstr "Effacer contour zone courant"
-
-#: pcbnew/zones.cpp:923
-msgid "No Net"
-msgstr "No Net"
-
-#: pcbnew/zones.cpp:925
-#: pcbnew/class_track.cpp:780
-msgid "NetName"
-msgstr "NetName"
-
-#: pcbnew/zones.cpp:995
-msgid "Ok"
-msgstr "Ok"
-
 #: pcbnew/xchgmod.cpp:80
 msgid "Exchange Modules"
 msgstr "Echange modules:"
@@ -2295,6 +2100,60 @@ msgstr "Gap (inch):"
 msgid "Abort routing?"
 msgstr "Stopper routage?"
 
+#: pcbnew/dialog_netlist.cpp:136
+msgid "Timestamp"
+msgstr "Timestamp"
+
+#: pcbnew/dialog_netlist.cpp:137
+msgid "Module Selection:"
+msgstr "S�lection module"
+
+#: pcbnew/dialog_netlist.cpp:142
+#: pcbnew/dialog_netlist.cpp:149
+msgid "Keep"
+msgstr "Garder"
+
+#: pcbnew/dialog_netlist.cpp:143
+#: pcbnew/onrightclick.cpp:598
+#: pcbnew/onrightclick.cpp:708
+#: pcbnew/onrightclick.cpp:805
+#: eeschema/edit_component_in_lib.cpp:239
+#: eeschema/edit_component_in_lib.cpp:320
+msgid "Delete"
+msgstr "Supprimer"
+
+#: pcbnew/dialog_netlist.cpp:144
+msgid "Bad Tracks Deletion:"
+msgstr "Supp. pistes err.:"
+
+#: pcbnew/dialog_netlist.cpp:150
+msgid "Change"
+msgstr "Changer"
+
+#: pcbnew/dialog_netlist.cpp:151
+msgid "Exchange Module:"
+msgstr "Echange module:"
+
+#: pcbnew/dialog_netlist.cpp:155
+msgid "Display Warnings"
+msgstr "Affiche warnings"
+
+#: pcbnew/dialog_netlist.cpp:164
+msgid "Select"
+msgstr "S�lection"
+
+#: pcbnew/dialog_netlist.cpp:168
+msgid "Read"
+msgstr "Lire"
+
+#: pcbnew/dialog_netlist.cpp:172
+msgid "Module Test"
+msgstr "Test Modules"
+
+#: pcbnew/dialog_netlist.cpp:176
+msgid "Compile"
+msgstr "Compile"
+
 #: pcbnew/set_grid.cpp:147
 #: pcbnew/dialog_general_options.cpp:271
 #: gerbview/options.cpp:185
@@ -2327,6 +2186,58 @@ msgstr "Module %s trouv
 msgid "Delete module?"
 msgstr "Effacer Module?"
 
+#: pcbnew/modedit.cpp:263
+msgid "Unable to find the footprint source on the main board"
+msgstr "Impossible de trouver le module source sur le PCB principal"
+
+#: pcbnew/modedit.cpp:264
+msgid ""
+"\n"
+"Cannot update the footprint"
+msgstr ""
+"\n"
+"Ne peut mettre � jour le module"
+
+#: pcbnew/modedit.cpp:272
+msgid "A footprint source was found on the main board"
+msgstr "Un module source a �t� trouv� sur le PCB principal"
+
+#: pcbnew/modedit.cpp:273
+msgid ""
+"\n"
+"Cannot insert this footprint"
+msgstr ""
+"\n"
+"Ne peut ins�rer cd module"
+
+#: pcbnew/modedit.cpp:395
+msgid "Add Pad"
+msgstr "Ajouter Pastilles"
+
+#: pcbnew/modedit.cpp:398
+#: pcbnew/tool_modedit.cpp:133
+#: pcbnew/menubarmodedit.cpp:45
+#: pcbnew/menubarpcb.cpp:209
+msgid "Pad Settings"
+msgstr "Caract pads"
+
+#: pcbnew/modedit.cpp:408
+#: eeschema/schedit.cpp:298
+msgid "Add Drawing"
+msgstr "Ajout d'�l�ments graphiques"
+
+#: pcbnew/modedit.cpp:412
+#: pcbnew/tool_modedit.cpp:185
+msgid "Place anchor"
+msgstr "Place Ancre"
+
+#: pcbnew/modedit.cpp:426
+#: pcbnew/edit.cpp:461
+#: eeschema/schedit.cpp:454
+#: eeschema/libframe.cpp:579
+msgid "Delete item"
+msgstr "Suppression d'�l�ments"
+
 #: pcbnew/editpads.cpp:77
 msgid "Pad Position"
 msgstr "Position Pad"
@@ -2511,6 +2422,91 @@ msgstr "Supprimer Module"
 msgid "Value "
 msgstr "Valeur "
 
+#: pcbnew/zones.cpp:153
+#: pcbnew/zones.cpp:154
+#: pcbnew/zones.cpp:155
+#: pcbnew/zones.cpp:156
+msgid "0.00000"
+msgstr "0.00000"
+
+#: pcbnew/zones.cpp:160
+msgid "Grid size:"
+msgstr "Dim Grille"
+
+#: pcbnew/zones.cpp:165
+msgid "Zone clearance value (mm):"
+msgstr "Valeur isolation zone (mm):"
+
+#: pcbnew/zones.cpp:182
+msgid "Include Pads"
+msgstr "Inclure Pads"
+
+#: pcbnew/zones.cpp:183
+msgid "Thermal"
+msgstr "Thermique"
+
+#: pcbnew/zones.cpp:184
+msgid "Exclude Pads"
+msgstr "Exclure Pads"
+
+#: pcbnew/zones.cpp:188
+msgid "Pad options:"
+msgstr "Options pads"
+
+#: pcbnew/zones.cpp:193
+#: eeschema/dialog_options.cpp:257
+msgid "Any"
+msgstr "Tout"
+
+#: pcbnew/zones.cpp:194
+msgid "H , V and 45 deg"
+msgstr "H, V et 45  deg"
+
+#: pcbnew/zones.cpp:198
+msgid "Zone edges orient:"
+msgstr "Direction contours zone:"
+
+#: pcbnew/zones.cpp:210
+msgid "Fill"
+msgstr "Remplissage"
+
+#: pcbnew/zones.cpp:224
+msgid "Update Options"
+msgstr "Maj Options"
+
+#: pcbnew/zones.cpp:233
+msgid "Zone clearance value:"
+msgstr "Valeur isolation zone:"
+
+#: pcbnew/zones.cpp:236
+msgid "Grid :"
+msgstr "Grille:"
+
+#: pcbnew/zones.cpp:399
+msgid "New zone segment width: "
+msgstr "Nouvelle largeur des segments zone:"
+
+#: pcbnew/zones.cpp:594
+msgid "Zone: No net selected"
+msgstr "Zone: Net non s�lectionn�"
+
+#: pcbnew/zones.cpp:636
+msgid "Delete Current Zone Edges"
+msgstr "Effacer contour zone courant"
+
+#: pcbnew/zones.cpp:923
+msgid "No Net"
+msgstr "No Net"
+
+#: pcbnew/zones.cpp:925
+#: pcbnew/class_track.cpp:780
+msgid "NetName"
+msgstr "NetName"
+
+#: pcbnew/zones.cpp:995
+msgid "Ok"
+msgstr "Ok"
+
 #: pcbnew/pcbcfg.cpp:68
 #: eeschema/eeconfig.cpp:58
 #: cvpcb/menucfg.cpp:170
@@ -2523,8 +2519,8 @@ msgstr "Lire config"
 msgid "File %s not found"
 msgstr " fichier %s non trouv�"
 
-#: pcbnew/pcbcfg.cpp:192
-#: eeschema/eeconfig.cpp:188
+#: pcbnew/pcbcfg.cpp:196
+#: eeschema/eeconfig.cpp:192
 #: cvpcb/cfg.cpp:71
 msgid "Save preferences"
 msgstr "Sauver pr�f�rences"
@@ -2697,7 +2693,7 @@ msgid "3D Shape Name"
 msgstr "3D forme"
 
 #: pcbnew/dialog_edit_module.cpp:395
-#: pcbnew/dialog_drc.cpp:208
+#: pcbnew/dialog_drc.cpp:213
 #: eeschema/dialog_eeschema_config.cpp:231
 msgid "Browse"
 msgstr "Examiner"
@@ -2735,27 +2731,6 @@ msgstr "R
 msgid "Delete [%s]"
 msgstr "Supprimer [%s]"
 
-#: pcbnew/class_board.cpp:317
-msgid "Nodes"
-msgstr "Nodes"
-
-#: pcbnew/class_board.cpp:320
-msgid "Links"
-msgstr "Liens"
-
-#: pcbnew/class_board.cpp:323
-msgid "Nets"
-msgstr "Nets"
-
-#: pcbnew/class_board.cpp:326
-msgid "Connect"
-msgstr "Connect"
-
-#: pcbnew/class_board.cpp:329
-#: eeschema/eelayer.h:115
-msgid "NoConn"
-msgstr "Non Conn"
-
 #: pcbnew/edit.cpp:171
 #: pcbnew/editmod.cpp:45
 msgid "Module Editor"
@@ -3601,7 +3576,6 @@ msgid "Create new library and save current module"
 msgstr "Cr�er une nouvelle librairie et y sauver le composant"
 
 #: pcbnew/tool_modedit.cpp:65
-#: eeschema/tool_lib.cpp:126
 msgid "Delete part in current library"
 msgstr "Supprimer composant en librairie de travail"
 
@@ -3630,15 +3604,15 @@ msgid "export module"
 msgstr "Exporter Module"
 
 #: pcbnew/tool_modedit.cpp:101
-#: eeschema/menubar.cpp:125
 #: eeschema/tool_lib.cpp:150
+#: eeschema/menubar.cpp:125
 #: eeschema/tool_sch.cpp:90
 msgid "Undo last edition"
 msgstr "Defait derni�re �dition"
 
 #: pcbnew/tool_modedit.cpp:103
-#: eeschema/menubar.cpp:132
 #: eeschema/tool_lib.cpp:152
+#: eeschema/menubar.cpp:132
 #: eeschema/tool_sch.cpp:93
 msgid "Redo the last undo command"
 msgstr "Refait la derni�re commande defaite"
@@ -3761,12 +3735,13 @@ msgstr "Y pos"
 
 #: pcbnew/set_color.cpp:269
 #: pcbnew/set_color.cpp:296
-#: gerbview/set_color.cpp:241
+#: gerbview/set_color.cpp:258
+#: gerbview/set_color.cpp:285
 msgid "Show None"
 msgstr "Rien Afficher"
 
 #: pcbnew/set_color.cpp:278
-#: gerbview/set_color.cpp:236
+#: gerbview/set_color.cpp:267
 msgid "Show All"
 msgstr "Tout Afficher"
 
@@ -3779,7 +3754,8 @@ msgid "Switch off all of the copper layers"
 msgstr "N'affiche pas les couches cuivre"
 
 #: pcbnew/set_color.cpp:361
-#: gerbview/set_color.cpp:257
+#: eeschema/eelayer.cpp:259
+#: gerbview/set_color.cpp:333
 msgid "Apply"
 msgstr "Appliquer"
 
@@ -4149,6 +4125,64 @@ msgstr "Autoroute Pad"
 msgid "Autoroute Net"
 msgstr "Autoroute Net"
 
+#: pcbnew/dialog_drc.cpp:147
+#: eeschema/dialog_create_component.cpp:176
+#: eeschema/dialog_erc.cpp:237
+#: eeschema/dialog_edit_component_in_schematic.cpp:201
+#: eeschema/dialog_edit_component_in_lib.cpp:166
+msgid "Options"
+msgstr "Options"
+
+#: pcbnew/dialog_drc.cpp:151
+#: pcbnew/dialog_track_options.cpp:164
+msgid "Clearance"
+msgstr "Isolation"
+
+#: pcbnew/dialog_drc.cpp:159
+msgid "Test Drc:"
+msgstr "Test Drc:"
+
+#: pcbnew/dialog_drc.cpp:163
+msgid "Include pad to pad test"
+msgstr "Inclure test pad � pad"
+
+#: pcbnew/dialog_drc.cpp:167
+msgid "Include unconnected"
+msgstr "Inclure non connexions"
+
+#: pcbnew/dialog_drc.cpp:175
+msgid "Create Report file"
+msgstr "Cr�er fichier rapport "
+
+#: pcbnew/dialog_drc.cpp:190
+msgid "Test Drc"
+msgstr "Test Drc"
+
+#: pcbnew/dialog_drc.cpp:194
+msgid "Stop Drc"
+msgstr "Stop Drc"
+
+#: pcbnew/dialog_drc.cpp:201
+msgid "Del Markers"
+msgstr "Supprimer Marqueurs"
+
+#: pcbnew/dialog_drc.cpp:205
+msgid "List Unconn"
+msgstr "Liste Non Conn."
+
+#: pcbnew/dialog_drc.cpp:209
+msgid "Report File"
+msgstr "Fichier rapport"
+
+#: pcbnew/dialog_drc.cpp:220
+#: share/svg_print.cpp:232
+msgid "Messages:"
+msgstr "Messages:"
+
+#: pcbnew/dialog_drc.cpp:342
+msgid "DRC Report file"
+msgstr "Fichier rapport de contr�le DRC:"
+
 #: pcbnew/moduleframe.cpp:182
 msgid "Module Editor: module modified!, Continue ?"
 msgstr "Editeur de Module: module modifi�!  Continuer ?"
@@ -4449,11 +4483,6 @@ msgstr "Type de Via"
 msgid "Track Width"
 msgstr "Epais. Piste"
 
-#: pcbnew/dialog_track_options.cpp:164
-#: pcbnew/dialog_drc.cpp:145
-msgid "Clearance"
-msgstr "Isolation"
-
 #: pcbnew/dialog_track_options.cpp:170
 msgid "Mask clearance"
 msgstr "Retrait Masque"
@@ -4777,64 +4806,32 @@ msgstr "Impossible de drag ce segment: trop de segments connect
 msgid "Unable to drag this segment: two collinear segments"
 msgstr "Impossible de drag ce segment: 2 segments align�s"
 
+#: pcbnew/class_board.cpp:317
+msgid "Nodes"
+msgstr "Nodes"
+
+#: pcbnew/class_board.cpp:320
+msgid "Links"
+msgstr "Liens"
+
+#: pcbnew/class_board.cpp:323
+msgid "Nets"
+msgstr "Nets"
+
+#: pcbnew/class_board.cpp:326
+msgid "Connect"
+msgstr "Connect"
+
+#: pcbnew/class_board.cpp:329
+#: eeschema/eelayer.h:116
+msgid "NoConn"
+msgstr "Non Conn"
+
 #: pcbnew/move-drag_pads.cpp:251
 #, c-format
 msgid "Delete Pad (module %s %s) "
 msgstr "Effacer Pad (module %s %s) "
 
-#: pcbnew/dialog_drc.cpp:141
-#: eeschema/dialog_edit_component_in_lib.cpp:166
-#: eeschema/dialog_create_component.cpp:176
-#: eeschema/dialog_erc.cpp:237
-#: eeschema/dialog_edit_component_in_schematic.cpp:201
-msgid "Options"
-msgstr "Options"
-
-#: pcbnew/dialog_drc.cpp:153
-msgid "Test Drc:"
-msgstr "Test Drc:"
-
-#: pcbnew/dialog_drc.cpp:157
-msgid "Include pad to pad test"
-msgstr "Inclure test pad � pad"
-
-#: pcbnew/dialog_drc.cpp:161
-msgid "Include unconnected"
-msgstr "Inclure non connexions"
-
-#: pcbnew/dialog_drc.cpp:169
-msgid "Create Report file"
-msgstr "Cr�er fichier rapport "
-
-#: pcbnew/dialog_drc.cpp:182
-msgid "Test Drc"
-msgstr "Test Drc"
-
-#: pcbnew/dialog_drc.cpp:186
-msgid "Stop Drc"
-msgstr "Stop Drc"
-
-#: pcbnew/dialog_drc.cpp:193
-msgid "Del Markers"
-msgstr "Supprimer Marqueurs"
-
-#: pcbnew/dialog_drc.cpp:197
-msgid "List Unconn"
-msgstr "Liste Non Conn."
-
-#: pcbnew/dialog_drc.cpp:204
-msgid "Report File"
-msgstr "Fichier rapport"
-
-#: pcbnew/dialog_drc.cpp:215
-#: share/svg_print.cpp:232
-msgid "Messages:"
-msgstr "Messages:"
-
-#: pcbnew/dialog_drc.cpp:350
-msgid "DRC Report file"
-msgstr "Fichier rapport de contr�le DRC:"
-
 #: eeschema/schedit.cpp:282
 msgid "Push/Pop Hierarchy"
 msgstr "Naviger dans Hi�rarchie"
@@ -5058,88 +5055,107 @@ msgstr "** Fin de Trac
 msgid "Plot  "
 msgstr "Trace  "
 
-#: eeschema/libedit.cpp:38
-msgid " Part:   "
-msgstr "Composant   "
+#: eeschema/tool_lib.cpp:48
+msgid "deselect current tool"
+msgstr "D�s�lection outil courant"
 
-#: eeschema/libedit.cpp:52
-msgid "   Convert"
-msgstr "  Convert"
+#: eeschema/tool_lib.cpp:54
+msgid "Add Pins"
+msgstr "Addition de \"pins\""
 
-#: eeschema/libedit.cpp:53
-msgid "   Normal"
-msgstr "  Normal"
+#: eeschema/tool_lib.cpp:58
+msgid "Add graphic text"
+msgstr "Addition de textes graphiques (commentaires)"
 
-#: eeschema/libedit.cpp:56
-msgid "  (Power Symbol)"
-msgstr "  (Symbole Alimentation)"
+#: eeschema/tool_lib.cpp:62
+msgid "Add rectangles"
+msgstr "Addition de rectangles"
 
-#: eeschema/libedit.cpp:90
-msgid "Current Part not saved, continue ?"
-msgstr "Composant courant non sauv�, continuer ?"
+#: eeschema/tool_lib.cpp:66
+msgid "Add circles"
+msgstr "Addition de cercles"
 
-#: eeschema/libedit.cpp:235
-msgid "Ok to modify Library File "
-msgstr "Ok pour modifier le fichier Librairie "
+#: eeschema/tool_lib.cpp:70
+msgid "Add arcs"
+msgstr "Addition d'arc"
 
-#: eeschema/libedit.cpp:244
-msgid "Error while saving Library File "
-msgstr "Erreur en sauvant le fichier Librairie "
+#: eeschema/tool_lib.cpp:74
+msgid "Add lines and polygons"
+msgstr "Addition de lignes ou polygones graphiques"
 
-#: eeschema/libedit.cpp:250
-msgid "Library File "
-msgstr "Fichier Librairie "
+#: eeschema/tool_lib.cpp:79
+msgid "Move part anchor"
+msgstr "Positionner l'ancre du composant"
 
-#: eeschema/libedit.cpp:252
-msgid "Document File "
-msgstr "Fichier de Doc "
+#: eeschema/tool_lib.cpp:84
+msgid "Import existing drawings"
+msgstr "Importer des dessins existants"
 
-#: eeschema/libedit.cpp:305
-msgid "No Active Library"
-msgstr "Pas de Librairie Active"
+#: eeschema/tool_lib.cpp:88
+msgid "Export current drawing"
+msgstr "Exporter le dessin en cours"
 
-#: eeschema/libedit.cpp:321
+#: eeschema/tool_lib.cpp:120
+msgid "Save current loaded library on disk (file update)"
+msgstr "Sauver librairie charg�e courante sur disque (mise � jour du fichier)"
+
+#: eeschema/tool_lib.cpp:126
+msgid "Delete component in current library"
+msgstr "Supprimer composant en librairie de travail"
+
+#: eeschema/tool_lib.cpp:130
+msgid "New component"
+msgstr "Nouveau composant"
+
+#: eeschema/tool_lib.cpp:133
+msgid "Select component to edit"
+msgstr "S�lectionner le composant a �diter"
+
+#: eeschema/tool_lib.cpp:137
+msgid "Save current component into current loaded library (in memory)"
+msgstr "Sauver le composant courant en librairie courante (en m�moire)"
+
+#: eeschema/tool_lib.cpp:140
+msgid "import component"
+msgstr "Importer composant"
+
+#: eeschema/tool_lib.cpp:143
+msgid "export component"
+msgstr "Exporter composant"
+
+#: eeschema/tool_lib.cpp:147
+msgid "Create a new library an save current component into"
+msgstr "Cr�er une nouvelle librairie et y sauver le composant"
+
+#: eeschema/tool_lib.cpp:160
+msgid "Edit component properties"
+msgstr "Editer ropri�t�s du composant"
+
+#: eeschema/tool_lib.cpp:167
+msgid "Test duplicate pins"
+msgstr "Test duplicate pins"
+
+#: eeschema/tool_lib.cpp:189
+msgid "show as \"De Morgan\" normal part"
+msgstr "Afficher sous repr�sentation normale"
+
+#: eeschema/tool_lib.cpp:195
+msgid "show as \"De Morgan\" convert part"
+msgstr "Afficher sous pr�sentation \" De Morgan\""
+
+#: eeschema/tool_lib.cpp:204
+msgid "Documents"
+msgstr "Documents"
+
+#: eeschema/tool_lib.cpp:221
+msgid "Edit pins part per part (Carefully use!)"
+msgstr "Editer pins unit� par unit� (Utiliser en connaissance de cause)"
+
+#: eeschema/tool_lib.cpp:241
+#: eeschema/tool_viewlib.cpp:131
 #, c-format
-msgid "Select Component (%d items)"
-msgstr "Selection composant (%d items)"
-
-#: eeschema/libedit.cpp:344
-msgid "Component not found"
-msgstr "Composant non trouv�"
-
-#: eeschema/libedit.cpp:348
-msgid "Delete component "
-msgstr "Suppression Composant "
-
-#: eeschema/libedit.cpp:349
-msgid " in library "
-msgstr " en librairie "
-
-#: eeschema/libedit.cpp:373
-msgid "Delete old component ?"
-msgstr "Supprimer ancien composant ?"
-
-#: eeschema/libedit.cpp:391
-msgid " exists in library "
-msgstr " existe en librairie "
-
-#: eeschema/libedit.cpp:558
-msgid "Warning: No component to Save"
-msgstr "Attention: pas de composant � sauver"
-
-#: eeschema/libedit.cpp:565
-msgid "No Library specified"
-msgstr "Pas de Librairie sp�cifi�e"
-
-#: eeschema/libedit.cpp:576
-#, c-format
-msgid "Component %s exists, Change it ?"
-msgstr "Le composant %s existe, Le changer ?"
-
-#: eeschema/libedit.cpp:615
-#, c-format
-msgid "Component %s saved in %s"
-msgstr "Composant %s sauv� en %s"
+msgid "Part %c"
+msgstr "Composant %c"
 
 #: eeschema/annotate_dialog.cpp:122
 msgid "Hierarchy"
@@ -5415,62 +5431,62 @@ msgstr "Epaiss. ligne par d
 msgid "Default Label Size"
 msgstr "Taille Label par d�faut:"
 
-#: eeschema/pinedit.cpp:22
-#: eeschema/pinedit-dialog.cpp:317
-msgid "line"
-msgstr "Ligne"
+#: eeschema/libframe.cpp:105
+msgid ""
+"Component was modified!\n"
+"Discard changes?"
+msgstr ""
+"Le composant a �t� modifi�\n"
+"Perdre les  changements"
 
-#: eeschema/pinedit.cpp:22
-#: eeschema/pinedit-dialog.cpp:318
-msgid "invert"
-msgstr "invert"
-
-#: eeschema/pinedit.cpp:22
-#: eeschema/pinedit-dialog.cpp:319
-msgid "clock"
-msgstr "clock"
-
-#: eeschema/pinedit.cpp:22
-#: eeschema/pinedit-dialog.cpp:320
-msgid "clock inv"
-msgstr "clock inv"
-
-#: eeschema/pinedit.cpp:23
-#: eeschema/pinedit-dialog.cpp:321
-msgid "low in"
-msgstr "low in"
-
-#: eeschema/pinedit.cpp:23
-#: eeschema/pinedit-dialog.cpp:322
-msgid "low clock"
-msgstr "low clock"
-
-#: eeschema/pinedit.cpp:23
-#: eeschema/pinedit-dialog.cpp:323
-msgid "low out"
-msgstr "low out"
-
-#: eeschema/pinedit.cpp:189
-msgid "Occupied by other pin, Continue ?"
-msgstr "Occup� une autre pin, Continuer ?"
-
-#: eeschema/pinedit.cpp:874
+#: eeschema/libframe.cpp:118
 #, c-format
-msgid "Duplicate Pin %4.4s (Pin %s loc %d, %d, and Pin %s loc %d, %d)"
-msgstr "Pin dupliqu�e  %4.4s (Pin %s loc %d, %d, etPin %s loc %d, %d)"
+msgid ""
+"Library \"%s\" was modified!\n"
+"Discard changes?"
+msgstr ""
+"Librairie \"%s\"  modifi�e!\n"
+"Perdre les changements ?"
 
-#: eeschema/pinedit.cpp:879
-#, c-format
-msgid "  Unit %d"
-msgstr "  Unit� %d"
+#: eeschema/libframe.cpp:344
+msgid "Include last component changes?"
+msgstr "Inclure les dernieres modifs du composant"
 
-#: eeschema/pinedit.cpp:884
-msgid "  Convert"
-msgstr "  Convert"
+#: eeschema/libframe.cpp:407
+msgid " Pins Test OK!"
+msgstr " Test Pins OK!"
 
-#: eeschema/pinedit.cpp:885
-msgid "  Normal"
-msgstr "  Normal"
+#: eeschema/libframe.cpp:481
+msgid "Add Pin"
+msgstr "Addition de \"pins\""
+
+#: eeschema/libframe.cpp:485
+msgid "Set Pin Options"
+msgstr "Choix Options des pins"
+
+#: eeschema/libframe.cpp:507
+msgid "Add Rectangle"
+msgstr "Addition de rectangles"
+
+#: eeschema/libframe.cpp:511
+msgid "Add Circle"
+msgstr "Addition de cercle"
+
+#: eeschema/libframe.cpp:515
+msgid "Add Arc"
+msgstr "Addition d' arc"
+
+#: eeschema/libframe.cpp:523
+msgid "Anchor"
+msgstr "Ancre"
+
+#: eeschema/libframe.cpp:527
+msgid "Import"
+msgstr "Importer"
+
+#: eeschema/libframe.cpp:533
+msgid "Export"
+msgstr "Exporter"
 
 #: eeschema/eeschema.cpp:57
 msgid "Eeschema is already running, Continue?"
@@ -5732,55 +5748,6 @@ msgstr ""
 msgid "Nothing found"
 msgstr " Rien trouv�"
 
-#: eeschema/libframe.cpp:105
-msgid "LibEdit: Part modified!, Continue ?"
-msgstr "LibEdit: composant modifi�,  Continuer ?"
-
-#: eeschema/libframe.cpp:118
-#, c-format
-msgid "Library %s modified!, Continue ?"
-msgstr "Librairie %s modifi�e!, Continuer ?"
-
-#: eeschema/libframe.cpp:344
-msgid "Include last component changes"
-msgstr "Inclure les dernieres modifs du composant"
-
-#: eeschema/libframe.cpp:407
-msgid " Tst Pins OK!"
-msgstr " Test Pins OK!"
-
-#: eeschema/libframe.cpp:481
-msgid "Add Pin"
-msgstr "Addition de \"pins\""
-
-#: eeschema/libframe.cpp:485
-msgid "Set Pin Opt"
-msgstr "Choix Options des pins"
-
-#: eeschema/libframe.cpp:507
-msgid "Add Rectangle"
-msgstr "Addition de rectangles"
-
-#: eeschema/libframe.cpp:511
-msgid "Add Circle"
-msgstr "Addition de cercle"
-
-#: eeschema/libframe.cpp:515
-msgid "Add Arc"
-msgstr "Addition d' arc"
-
-#: eeschema/libframe.cpp:523
-msgid "Anchor"
-msgstr "Ancre"
-
-#: eeschema/libframe.cpp:527
-msgid "Import"
-msgstr "Importer"
-
-#: eeschema/libframe.cpp:533
-msgid "Export"
-msgstr "Exporter"
-
 #: eeschema/getpart.cpp:106
 #, c-format
 msgid "component selection (%d items loaded):"
@@ -5897,104 +5864,6 @@ msgstr "Messages :"
 msgid "Plot: %s\n"
 msgstr "Trace: %s\n"
 
-#: eeschema/tool_lib.cpp:48
-msgid "deselect current tool"
-msgstr "D�s�lection outil courant"
-
-#: eeschema/tool_lib.cpp:54
-msgid "Add Pins"
-msgstr "Addition de \"pins\""
-
-#: eeschema/tool_lib.cpp:58
-msgid "Add graphic text"
-msgstr "Addition de textes graphiques (commentaires)"
-
-#: eeschema/tool_lib.cpp:62
-msgid "Add rectangles"
-msgstr "Addition de rectangles"
-
-#: eeschema/tool_lib.cpp:66
-msgid "Add circles"
-msgstr "Addition de cercles"
-
-#: eeschema/tool_lib.cpp:70
-msgid "Add arcs"
-msgstr "Addition d'arc"
-
-#: eeschema/tool_lib.cpp:74
-msgid "Add lines and polygons"
-msgstr "Addition de lignes ou polygones graphiques"
-
-#: eeschema/tool_lib.cpp:79
-msgid "Move part anchor"
-msgstr "Positionner l'ancre du composant"
-
-#: eeschema/tool_lib.cpp:84
-msgid "Import existing drawings"
-msgstr "Importer des dessins existants"
-
-#: eeschema/tool_lib.cpp:88
-msgid "Export current drawing"
-msgstr "Exporter le dessin en cours"
-
-#: eeschema/tool_lib.cpp:120
-msgid "Save current loaded library on disk (file update)"
-msgstr "Sauver librairie charg�e courante sur disque (mise � jour du fichier)"
-
-#: eeschema/tool_lib.cpp:130
-msgid "New part"
-msgstr "Nouveau composant"
-
-#: eeschema/tool_lib.cpp:133
-msgid "Select part to edit"
-msgstr "S�lectionner le composant a �diter"
-
-#: eeschema/tool_lib.cpp:137
-msgid "Save current part into current loaded library (in memory)"
-msgstr "Sauver le composant courant en librairie courante (en m�moire)"
-
-#: eeschema/tool_lib.cpp:140
-msgid "import part"
-msgstr "Importer un composant"
-
-#: eeschema/tool_lib.cpp:143
-msgid "export part"
-msgstr "Exporter un composant"
-
-#: eeschema/tool_lib.cpp:147
-msgid "Create a new library an save current part into"
-msgstr "Cr�er une nouvelle librairie et y sauver le composant"
-
-#: eeschema/tool_lib.cpp:160
-msgid "Edit Part Properties"
-msgstr "Editer les propri�t�s du composant"
-
-#: eeschema/tool_lib.cpp:167
-msgid "Test duplicate pins"
-msgstr "Test duplicate pins"
-
-#: eeschema/tool_lib.cpp:189
-msgid "show as \"De Morgan\" normal part"
-msgstr "Afficher sous repr�sentation normale"
-
-#: eeschema/tool_lib.cpp:195
-msgid "show as \"De Morgan\" convert part"
-msgstr "Afficher sous pr�sentation \" De Morgan\""
-
-#: eeschema/tool_lib.cpp:204
-msgid "Documents"
-msgstr "Documents"
-
-#: eeschema/tool_lib.cpp:221
-msgid "Edit pins part per part (Carefully use!)"
-msgstr "Editer pins unit� par unit� (Utiliser en connaissance de cause)"
-
-#: eeschema/tool_lib.cpp:241
-#: eeschema/tool_viewlib.cpp:131
-#, c-format
-msgid "Part %c"
-msgstr "Composant %c"
-
 #: eeschema/symbedit.cpp:52
 msgid "Import symbol drawings:"
 msgstr "Importer les symboles:"
@@ -6025,6 +5894,63 @@ msgstr "Symbole sauv
 msgid "Navigator"
 msgstr "Navigateur"
 
+#: eeschema/pinedit.cpp:22
+#: eeschema/pinedit-dialog.cpp:317
+msgid "line"
+msgstr "Ligne"
+
+#: eeschema/pinedit.cpp:22
+#: eeschema/pinedit-dialog.cpp:318
+msgid "invert"
+msgstr "invert"
+
+#: eeschema/pinedit.cpp:22
+#: eeschema/pinedit-dialog.cpp:319
+msgid "clock"
+msgstr "clock"
+
+#: eeschema/pinedit.cpp:22
+#: eeschema/pinedit-dialog.cpp:320
+msgid "clock inv"
+msgstr "clock inv"
+
+#: eeschema/pinedit.cpp:23
+#: eeschema/pinedit-dialog.cpp:321
+msgid "low in"
+msgstr "low in"
+
+#: eeschema/pinedit.cpp:23
+#: eeschema/pinedit-dialog.cpp:322
+msgid "low clock"
+msgstr "low clock"
+
+#: eeschema/pinedit.cpp:23
+#: eeschema/pinedit-dialog.cpp:323
+msgid "low out"
+msgstr "low out"
+
+#: eeschema/pinedit.cpp:189
+msgid "Occupied by other pin. Continue?"
+msgstr "Occup� une autre pin, Continuer ?"
+
+#: eeschema/pinedit.cpp:874
+#, c-format
+msgid "Duplicate Pin %4.4s (Pin %s loc %d, %d, and Pin %s loc %d, %d)"
+msgstr "Pin dupliqu�e  %4.4s (Pin %s loc %d, %d, etPin %s loc %d, %d)"
+
+#: eeschema/pinedit.cpp:879
+#, c-format
+msgid "  Part %d"
+msgstr "Composant %d"
+
+#: eeschema/pinedit.cpp:884
+msgid "  Convert"
+msgstr "  Convert"
+
+#: eeschema/pinedit.cpp:885
+msgid "  Normal"
+msgstr "  Normal"
+
 #: eeschema/tool_viewlib.cpp:52
 msgid "Select library to browse"
 msgstr "S�lection de la librairie a examiner"
@@ -6121,24 +6047,110 @@ msgstr "Erreur: Root Part <%s> non trouv
 msgid "Current Part: <%s>"
 msgstr "Cmp Courant: <%s>"
 
-#: eeschema/eelayer.cpp:233
-msgid "White"
-msgstr "Blanc"
+#: eeschema/libedit.cpp:38
+msgid " Part:   "
+msgstr "Composant   "
 
-#: eeschema/eelayer.cpp:234
-#: share/dialog_print.cpp:184
-msgid "Black"
-msgstr "Noir"
+#: eeschema/libedit.cpp:52
+msgid "   Convert"
+msgstr "  Convert"
 
-#: eeschema/eelayer.cpp:235
-msgid "Background Color:"
-msgstr "Couleur du Fond:"
+#: eeschema/libedit.cpp:53
+msgid "   Normal"
+msgstr "  Normal"
 
-#: eeschema/eelayer.cpp:256
-#: eeschema/dialog_build_BOM.cpp:354
-#: cvpcb/dialog_display_options.cpp:195
-msgid "&Apply"
-msgstr "&Appliquer"
+#: eeschema/libedit.cpp:56
+msgid "  (Power Symbol)"
+msgstr "  (Symbole Alimentation)"
+
+#: eeschema/libedit.cpp:90
+msgid ""
+"Current Part not saved.\n"
+"Continue?"
+msgstr ""
+"Composant courant non sauv�.\n"
+" continuer ?"
+
+#: eeschema/libedit.cpp:113
+#: eeschema/libedit.cpp:390
+msgid "Component \""
+msgstr "Composant \""
+
+#: eeschema/libedit.cpp:113
+msgid "\" not found."
+msgstr "\"  non trouv�"
+
+#: eeschema/libedit.cpp:235
+msgid "Modify Library File \""
+msgstr "Ok pour modifier le fichier Librairie \""
+
+#: eeschema/libedit.cpp:235
+msgid "\"?"
+msgstr "\"?"
+
+#: eeschema/libedit.cpp:244
+msgid "Error while saving Library File \""
+msgstr "Erreur en sauvant le fichier Librairie \""
+
+#: eeschema/libedit.cpp:244
+#: eeschema/libedit.cpp:391
+msgid "\"."
+msgstr "\"."
+
+#: eeschema/libedit.cpp:250
+msgid "Library File \""
+msgstr "Fichier Librairie \""
+
+#: eeschema/libedit.cpp:252
+msgid "Document File \""
+msgstr "Fichier de Doc \""
+
+#: eeschema/libedit.cpp:305
+msgid "No Active Library"
+msgstr "Pas de Librairie Active"
+
+#: eeschema/libedit.cpp:321
+#, c-format
+msgid "Select Component (%d items)"
+msgstr "Selection composant (%d items)"
+
+#: eeschema/libedit.cpp:344
+msgid "Component not found"
+msgstr "Composant non trouv�"
+
+#: eeschema/libedit.cpp:348
+msgid "Delete component \""
+msgstr "Suppression Composant \""
+
+#: eeschema/libedit.cpp:349
+msgid "\" from library \""
+msgstr "\" de la librairie \""
+
+#: eeschema/libedit.cpp:373
+msgid "Delete old component?"
+msgstr "Supprimer ancien composant ?"
+
+#: eeschema/libedit.cpp:391
+msgid "\" exists in library \""
+msgstr "\"  existe en librairie \""
+
+#: eeschema/libedit.cpp:558
+msgid "No component to Save."
+msgstr "Pas de composant � sauver"
+
+#: eeschema/libedit.cpp:565
+msgid "No Library specified."
+msgstr "Pas de Librairie sp�cifi�e."
+
+#: eeschema/libedit.cpp:576
+#, c-format
+msgid "Component \"%s\" exists. Change it?"
+msgstr "Le composant \" %s\" existe, Le changer ?"
+
+#: eeschema/libedit.cpp:615
+#, c-format
+msgid "Component %s saved in %s"
+msgstr "Composant %s sauv� en %s"
 
 #: eeschema/affiche.cpp:22
 #: eeschema/dialog_create_component.cpp:157
@@ -6175,7 +6187,7 @@ msgid "PinName"
 msgstr "Nom Pin"
 
 #: eeschema/affiche.cpp:80
-#: eeschema/eelayer.h:140
+#: eeschema/eelayer.h:141
 msgid "PinNum"
 msgstr "Num Pin"
 
@@ -6250,63 +6262,6 @@ msgstr "Feuille %s (fichier %s) modifi
 msgid "Arc %.1f deg"
 msgstr "Arc %.1f deg"
 
-#: eeschema/dialog_edit_component_in_lib.cpp:136
-msgid "General :"
-msgstr " G�n�ral :"
-
-#: eeschema/dialog_edit_component_in_lib.cpp:144
-msgid "Number of Units:"
-msgstr "Nombre de parts:"
-
-#: eeschema/dialog_edit_component_in_lib.cpp:152
-#: eeschema/dialog_create_component.cpp:259
-msgid "Skew:"
-msgstr "D�calage:"
-
-#: eeschema/dialog_edit_component_in_lib.cpp:158
-#: eeschema/dialog_create_component.cpp:184
-msgid "Power Symbol"
-msgstr "Symbole Alimentation"
-
-#: eeschema/dialog_edit_component_in_lib.cpp:162
-#: eeschema/dialog_create_component.cpp:188
-#: eeschema/dialog_edit_component_in_schematic.cpp:187
-msgid "Parts are locked"
-msgstr "Les parts sont verrouill�es"
-
-#: eeschema/dialog_edit_component_in_lib.cpp:172
-msgid "Doc:"
-msgstr "Doc:"
-
-#: eeschema/dialog_edit_component_in_lib.cpp:179
-msgid "Keywords:"
-msgstr "Mots Cles:"
-
-#: eeschema/dialog_edit_component_in_lib.cpp:186
-msgid "DocFileName:"
-msgstr "Fichier de Doc:"
-
-#: eeschema/dialog_edit_component_in_lib.cpp:195
-msgid "Copy Doc"
-msgstr "Copie Doc"
-
-#: eeschema/dialog_edit_component_in_lib.cpp:199
-msgid "Browse DocFiles"
-msgstr "Examen Fichiers de Doc"
-
-#: eeschema/dialog_edit_component_in_lib.cpp:207
-#: eeschema/edit_component_in_lib.cpp:216
-msgid "Alias"
-msgstr "Alias"
-
-#: eeschema/libarch.cpp:80
-msgid "Failed to create archive lib file "
-msgstr "Impossible de cr�er le fichier librairie archive "
-
-#: eeschema/libarch.cpp:87
-msgid "Failed to create doc lib file "
-msgstr "Impossible de cr�er le fichier lib document"
-
 #: eeschema/dialog_create_component.cpp:168
 msgid "U"
 msgstr "U"
@@ -6316,6 +6271,17 @@ msgstr "U"
 msgid "As Convert"
 msgstr "A une forme \"convertie\""
 
+#: eeschema/dialog_create_component.cpp:184
+#: eeschema/dialog_edit_component_in_lib.cpp:158
+msgid "Power Symbol"
+msgstr "Symbole Alimentation"
+
+#: eeschema/dialog_create_component.cpp:188
+#: eeschema/dialog_edit_component_in_schematic.cpp:187
+#: eeschema/dialog_edit_component_in_lib.cpp:162
+msgid "Parts are locked"
+msgstr "Les parts sont verrouill�es"
+
 #: eeschema/dialog_create_component.cpp:211
 msgid "&1"
 msgstr "&1"
@@ -6420,18 +6386,17 @@ msgstr "&25"
 msgid "&26"
 msgstr "&26"
 
-#: eeschema/dialog_create_component.cpp:238
-msgid "Parts per package"
-msgstr "Parts par boiter"
+#: eeschema/dialog_create_component.cpp:237
+msgid "Parts per component"
+msgstr "Parts par omposant"
 
 #: eeschema/dialog_create_component.cpp:243
 msgid "Draw options"
 msgstr "Options affichage"
 
 #: eeschema/dialog_create_component.cpp:247
-#: eeschema/edit_component_in_lib.cpp:407
-msgid "Show Pin Num"
-msgstr "Montre Num�ro de Pin"
+msgid "Show Pin Number"
+msgstr "Montrer Num�ro de Pin"
 
 #: eeschema/dialog_create_component.cpp:251
 #: eeschema/edit_component_in_lib.cpp:418
@@ -6443,10 +6408,36 @@ msgstr "Montre Nom de Pin"
 msgid "Pin Name Inside"
 msgstr "Nom de pin a l'int�rieur"
 
+#: eeschema/dialog_create_component.cpp:259
+#: eeschema/dialog_edit_component_in_lib.cpp:152
+msgid "Skew:"
+msgstr "D�calage:"
+
 #: eeschema/dialog_create_component.cpp:311
 msgid "You must provide a name for this component"
 msgstr "Vous devez fournir un nom pour ce composant"
 
+#: eeschema/eelayer.cpp:233
+msgid "White"
+msgstr "Blanc"
+
+#: eeschema/eelayer.cpp:234
+#: share/dialog_print.cpp:184
+msgid "Black"
+msgstr "Noir"
+
+#: eeschema/eelayer.cpp:235
+msgid "Background Color:"
+msgstr "Couleur du Fond:"
+
+#: eeschema/libarch.cpp:80
+msgid "Failed to create archive lib file "
+msgstr "Impossible de cr�er le fichier librairie archive "
+
+#: eeschema/libarch.cpp:87
+msgid "Failed to create doc lib file "
+msgstr "Impossible de cr�er le fichier lib document"
+
 #: eeschema/database.cpp:70
 msgid "No Component found"
 msgstr "Pas de composants trouv�s"
@@ -6524,7 +6515,7 @@ msgid "Netlist command:"
 msgstr "Commande netliste:"
 
 #: eeschema/netlist_control.cpp:428
-#: share/setpage.cpp:262
+#: share/setpage.cpp:352
 msgid "Title:"
 msgstr "Titre:"
 
@@ -6712,6 +6703,11 @@ msgstr "Champ 8"
 msgid "Create &List"
 msgstr "Cr�er &Liste"
 
+#: eeschema/dialog_build_BOM.cpp:354
+#: cvpcb/dialog_display_options.cpp:195
+msgid "&Apply"
+msgstr "&Appliquer"
+
 #: eeschema/dialog_build_BOM.cpp:560
 msgid "Bill of material:"
 msgstr "Liste du materiel:"
@@ -6800,6 +6796,42 @@ msgstr "> %-28.28s Sheet %-7.7s (feuille %.2d) pos: %3.3f, %3.3f\n"
 msgid "#End labels\n"
 msgstr "#End labels\n"
 
+#: eeschema/lib_export.cpp:39
+msgid "Import component:"
+msgstr "Importer composant:"
+
+#: eeschema/lib_export.cpp:71
+msgid "File is empty"
+msgstr "Fichier vide"
+
+#: eeschema/lib_export.cpp:92
+msgid "No Part to Save"
+msgstr "Pas de composant � sauver"
+
+#: eeschema/lib_export.cpp:101
+msgid "New Library"
+msgstr "Nouvelle Librairie"
+
+#: eeschema/lib_export.cpp:101
+msgid "Export component:"
+msgstr "Exporter composant:"
+
+#: eeschema/lib_export.cpp:135
+msgid "0k"
+msgstr "Ok"
+
+#: eeschema/lib_export.cpp:137
+msgid ""
+"Note: this new library will be available only if it is loaded by eeschema.\n"
+"Modify eeschema config if you want use it."
+msgstr ""
+"Note: cette nouvelle librairie sera disponible seulement si elle est charg�e par eeschema\n"
+"Modifier la config de eeschema si vous voulez l'utiliser"
+
+#: eeschema/lib_export.cpp:139
+msgid "Error while create "
+msgstr "Erreur en cr�ation de "
+
 #: eeschema/edit_label.cpp:49
 msgid "Empty Text!"
 msgstr "Texte vide"
@@ -7067,7 +7099,7 @@ msgstr "Texte visible"
 
 #: eeschema/dialog_edit_component_in_schematic.cpp:225
 #: eeschema/edit_component_in_lib.cpp:484
-#: eeschema/eelayer.h:164
+#: eeschema/eelayer.h:165
 msgid "Fields"
 msgstr "Champs"
 
@@ -7195,6 +7227,39 @@ msgstr "Addition de textes graphiques (commentaires)"
 msgid "HV orientation for Wires and Bus"
 msgstr "Force direction H, V et X  pour les fils et bus"
 
+#: eeschema/dialog_edit_component_in_lib.cpp:136
+msgid "General :"
+msgstr " G�n�ral :"
+
+#: eeschema/dialog_edit_component_in_lib.cpp:144
+msgid "Number of Parts:"
+msgstr "Nombre de Parts:"
+
+#: eeschema/dialog_edit_component_in_lib.cpp:172
+msgid "Doc:"
+msgstr "Doc:"
+
+#: eeschema/dialog_edit_component_in_lib.cpp:179
+msgid "Keywords:"
+msgstr "Mots Cles:"
+
+#: eeschema/dialog_edit_component_in_lib.cpp:186
+msgid "DocFileName:"
+msgstr "Fichier de Doc:"
+
+#: eeschema/dialog_edit_component_in_lib.cpp:195
+msgid "Copy Doc"
+msgstr "Copie Doc"
+
+#: eeschema/dialog_edit_component_in_lib.cpp:199
+msgid "Browse DocFiles"
+msgstr "Examen Fichiers de Doc"
+
+#: eeschema/dialog_edit_component_in_lib.cpp:207
+#: eeschema/edit_component_in_lib.cpp:216
+msgid "Alias"
+msgstr "Alias"
+
 #: eeschema/pinedit-dialog.cpp:233
 msgid "Pin Name :"
 msgstr "Nom de la pin :"
@@ -7251,42 +7316,6 @@ msgstr "Emetteur ouv."
 msgid "Electrical Type:"
 msgstr "Type �lectrique:"
 
-#: eeschema/lib_export.cpp:39
-msgid "Import part:"
-msgstr "Importer composant"
-
-#: eeschema/lib_export.cpp:71
-msgid "File is empty"
-msgstr "Fichier vide"
-
-#: eeschema/lib_export.cpp:92
-msgid "No Part to Save"
-msgstr "Pas de composant � sauver"
-
-#: eeschema/lib_export.cpp:101
-msgid "New Library"
-msgstr "Nouvelle Librairie"
-
-#: eeschema/lib_export.cpp:101
-msgid "Export part:"
-msgstr "Exporter composant"
-
-#: eeschema/lib_export.cpp:135
-msgid "0k"
-msgstr "Ok"
-
-#: eeschema/lib_export.cpp:137
-msgid ""
-"Note: this new library will be available only if it is loaded by eeschema\n"
-"Modify eeschema config if you want use it"
-msgstr ""
-"Note: cette librairie ne sera disponoble seulement si elle est charg�e par eeschema\n"
-" Modifier la config de eeschema si vous voulez l'utiliser"
-
-#: eeschema/lib_export.cpp:139
-msgid "Error while create "
-msgstr "Erreur en cr�ation de "
-
 #: eeschema/libedit_onrightclick.cpp:103
 msgid "Move Arc"
 msgstr "D�placer arc"
@@ -7436,7 +7465,7 @@ msgid "Library browser"
 msgstr "Visualisateur des librairies"
 
 #: eeschema/component_class.cpp:57
-#: eeschema/eelayer.h:171
+#: eeschema/eelayer.h:172
 msgid "Sheet"
 msgstr "Feuille"
 
@@ -7712,6 +7741,10 @@ msgstr "Filtrage Modules"
 msgid "Footprints"
 msgstr "Modules"
 
+#: eeschema/edit_component_in_lib.cpp:407
+msgid "Show Pin Num"
+msgstr "Montre Num�ro de Pin"
+
 #: eeschema/edit_component_in_lib.cpp:476
 msgid "Left justify"
 msgstr "Justifi� � gauche"
@@ -8596,10 +8629,6 @@ msgstr "Effacer Zones ?"
 msgid "Delete Layer %d"
 msgstr "Effacer Couche %d"
 
-#: gerbview/set_color.cpp:151
-msgid "GerbView Layer Colors:"
-msgstr "Gerbview: Couleur des couches"
-
 #: gerbview/dcode.cpp:438
 msgid "List D codes"
 msgstr "Liste D-Codes"
@@ -8717,6 +8746,14 @@ msgstr "Couche Gerber "
 msgid "Do not export"
 msgstr "Ne pas exporter"
 
+#: gerbview/set_color.cpp:279
+msgid "Switch on all of the Gerber layers"
+msgstr "Affiche toutes les couches Gerber"
+
+#: gerbview/set_color.cpp:288
+msgid "Switch off all of the Gerber layers"
+msgstr "N'affiche pas les couches Gerber"
+
 #: gerbview/gerberframe.cpp:177
 msgid "Layer modified,  Continue ?"
 msgstr "Couche modifi�e,  Continuer ?"
@@ -8956,51 +8993,59 @@ msgstr "Touches autoris
 msgid "Unable to read "
 msgstr "Impossible de lire "
 
-#: common/hotkeys_basic.cpp:610
+#: common/hotkeys_basic.cpp:611
+msgid "Show Current Hotkey List"
+msgstr "Afficher Liste Actuelle des Hotkeys"
+
+#: common/hotkeys_basic.cpp:612
+msgid "Show the current hotkey config"
+msgstr "Affiche la configuration actuelle des Hotkeys"
+
+#: common/hotkeys_basic.cpp:618
 msgid "Create Hotkey config file"
 msgstr "Cr�er le fichiers configuration des Hotkeys"
 
-#: common/hotkeys_basic.cpp:611
+#: common/hotkeys_basic.cpp:619
 msgid "Create or Recreate the hotkey config file from current hotkey list"
 msgstr "Cr�er ou recr�er les fichiers configuration des Hotkeys a partir de la liste courante"
 
-#: common/hotkeys_basic.cpp:616
+#: common/hotkeys_basic.cpp:625
 msgid "Reread Hotkey config file"
 msgstr "Relire  les fichiers configuration des Hotkeys"
 
-#: common/hotkeys_basic.cpp:617
+#: common/hotkeys_basic.cpp:626
 msgid "Reread the hotkey config file"
 msgstr "Relire  les fichiers configuration des Hotkeys"
 
-#: common/hotkeys_basic.cpp:621
+#: common/hotkeys_basic.cpp:630
 msgid "Edit Hotkey config file"
 msgstr "Editer  le fichiers configuration des Hotkeys"
 
-#: common/hotkeys_basic.cpp:622
+#: common/hotkeys_basic.cpp:631
 msgid "Run the text editor and edit the hotkey config file"
 msgstr "Lancer l'�diteur de texte et �diter le fichier de config des hotkeys"
 
-#: common/hotkeys_basic.cpp:628
+#: common/hotkeys_basic.cpp:637
 msgid "home directory"
 msgstr "R�pertoire d'accueil (home)"
 
-#: common/hotkeys_basic.cpp:629
+#: common/hotkeys_basic.cpp:638
 msgid "Use home directory to load or store Hotkey config files"
 msgstr "Utiliser le r�pertoire d'accueil pour charger ou sauver les fichiers de config  des Hotkeys"
 
-#: common/hotkeys_basic.cpp:634
+#: common/hotkeys_basic.cpp:643
 msgid "kicad/template directory"
 msgstr "kicad/template directory"
 
-#: common/hotkeys_basic.cpp:635
+#: common/hotkeys_basic.cpp:644
 msgid "Use kicad/template directory to load or store Hotkey config files"
 msgstr "Utiliser r�pertoire kicad/template pour charger ou sauver les fichiers de config  des Hotkeys"
 
-#: common/hotkeys_basic.cpp:641
+#: common/hotkeys_basic.cpp:650
 msgid "Hotkey config location"
 msgstr "Emplacement des Fichiers des Hotkeys"
 
-#: common/hotkeys_basic.cpp:643
+#: common/hotkeys_basic.cpp:652
 msgid "Hotkey config file location selection (home directory or kicad tree)"
 msgstr "Selection emplacement des fichiers de config. des hotkeys(\"home\" ou r�pertoire kicad)"
 
@@ -9078,7 +9123,7 @@ msgstr "Ne peut trouver le visualisateur Pdf %s"
 msgid "Infos:"
 msgstr "Infos:"
 
-#: common/selcolor.cpp:75
+#: common/selcolor.cpp:76
 msgid "Colors"
 msgstr "Couleurs"
 
@@ -9516,106 +9561,6 @@ msgstr "Cr
 msgid " error"
 msgstr " erreur"
 
-#: share/setpage.cpp:198
-msgid "Size A4"
-msgstr "Format A4 "
-
-#: share/setpage.cpp:199
-msgid "Size A3"
-msgstr "Format A3"
-
-#: share/setpage.cpp:200
-msgid "Size A2"
-msgstr "Format A2"
-
-#: share/setpage.cpp:201
-msgid "Size A1"
-msgstr "Format A1"
-
-#: share/setpage.cpp:202
-msgid "Size A0"
-msgstr "Format A0"
-
-#: share/setpage.cpp:203
-msgid "Size A"
-msgstr "Format A"
-
-#: share/setpage.cpp:204
-msgid "Size B"
-msgstr "Format B"
-
-#: share/setpage.cpp:205
-msgid "Size C"
-msgstr "Format C"
-
-#: share/setpage.cpp:206
-msgid "Size D"
-msgstr "Format D"
-
-#: share/setpage.cpp:207
-msgid "Size E"
-msgstr "Format E"
-
-#: share/setpage.cpp:208
-msgid "User size"
-msgstr "Format libre"
-
-#: share/setpage.cpp:210
-msgid "Page Size:"
-msgstr "Dim Page:"
-
-#: share/setpage.cpp:214
-msgid "User Page Size X: "
-msgstr "Format libre dim X: "
-
-#: share/setpage.cpp:220
-msgid "User Page Size Y: "
-msgstr "Format libre dim Y: "
-
-#: share/setpage.cpp:244
-#, c-format
-msgid "Number of sheets: %d"
-msgstr "Number of feuilles: %d"
-
-#: share/setpage.cpp:250
-#, c-format
-msgid "Sheet number: %d"
-msgstr "Num�ro feuille: %d"
-
-#: share/setpage.cpp:254
-msgid "Revision:"
-msgstr "R�vision:"
-
-#: share/setpage.cpp:270
-msgid "Company:"
-msgstr "Soci�t�:"
-
-#: share/setpage.cpp:278
-msgid "Comment1:"
-msgstr "Commentaire1: "
-
-#: share/setpage.cpp:286
-msgid "Comment2:"
-msgstr "Commentaire2:"
-
-#: share/setpage.cpp:294
-msgid "Comment3:"
-msgstr "Commentaire3:"
-
-#: share/setpage.cpp:302
-msgid "Comment4:"
-msgstr "Commentaire4:"
-
-#: share/setpage.cpp:322
-#: share/setpage.cpp:324
-#: share/setpage.cpp:326
-#: share/setpage.cpp:328
-#: share/setpage.cpp:330
-#: share/setpage.cpp:332
-#: share/setpage.cpp:334
-msgid "Export to other sheets"
-msgstr "Exporter vers autres feuilles"
-
 #: share/drawframe.cpp:136
 msgid "font for info display"
 msgstr "fonte pour affichage infos"
@@ -9670,6 +9615,106 @@ msgstr ""
 "\n"
 "International wiki:\n"
 
+#: share/setpage.cpp:274
+msgid "Size A4"
+msgstr "Format A4 "
+
+#: share/setpage.cpp:275
+msgid "Size A3"
+msgstr "Format A3"
+
+#: share/setpage.cpp:276
+msgid "Size A2"
+msgstr "Format A2"
+
+#: share/setpage.cpp:277
+msgid "Size A1"
+msgstr "Format A1"
+
+#: share/setpage.cpp:278
+msgid "Size A0"
+msgstr "Format A0"
+
+#: share/setpage.cpp:279
+msgid "Size A"
+msgstr "Format A"
+
+#: share/setpage.cpp:280
+msgid "Size B"
+msgstr "Format B"
+
+#: share/setpage.cpp:281
+msgid "Size C"
+msgstr "Format C"
+
+#: share/setpage.cpp:282
+msgid "Size D"
+msgstr "Format D"
+
+#: share/setpage.cpp:283
+msgid "Size E"
+msgstr "Format E"
+
+#: share/setpage.cpp:284
+msgid "User size"
+msgstr "Format libre"
+
+#: share/setpage.cpp:285
+msgid "Page Size:"
+msgstr "Dim Page:"
+
+#: share/setpage.cpp:292
+msgid "User Page Size X: "
+msgstr "Format libre dim X: "
+
+#: share/setpage.cpp:301
+msgid "User Page Size Y: "
+msgstr "Format libre dim Y: "
+
+#: share/setpage.cpp:328
+#, c-format
+msgid "Number of sheets: %d"
+msgstr "Number of feuilles: %d"
+
+#: share/setpage.cpp:334
+#, c-format
+msgid "Sheet number: %d"
+msgstr "Num�ro feuille: %d"
+
+#: share/setpage.cpp:338
+msgid "Revision:"
+msgstr "R�vision:"
+
+#: share/setpage.cpp:347
+#: share/setpage.cpp:361
+#: share/setpage.cpp:375
+#: share/setpage.cpp:389
+#: share/setpage.cpp:403
+#: share/setpage.cpp:417
+#: share/setpage.cpp:431
+msgid "Export to other sheets"
+msgstr "Exporter vers autres feuilles"
+
+#: share/setpage.cpp:366
+msgid "Company:"
+msgstr "Soci�t�:"
+
+#: share/setpage.cpp:380
+msgid "Comment1:"
+msgstr "Commentaire1: "
+
+#: share/setpage.cpp:394
+msgid "Comment2:"
+msgstr "Commentaire2:"
+
+#: share/setpage.cpp:408
+msgid "Comment3:"
+msgstr "Commentaire3:"
+
+#: share/setpage.cpp:422
+msgid "Comment4:"
+msgstr "Commentaire4:"
+
 #: pcbnew/gen_self.h:217
 msgid "Length(inch):"
 msgstr "Longueur (pouces):"
@@ -9695,6 +9740,10 @@ msgstr "Nbr segm = %d, Longueur = "
 msgid "Find"
 msgstr "Chercher"
 
+#: pcbnew/dialog_drc.h:60
+msgid "DRC Control"
+msgstr "Controle ERC"
+
 #: pcbnew/dialog_setup_libs.h:43
 #: eeschema/dialog_eeschema_config.h:50
 #: eeschema/dialog_edit_label.h:44
@@ -9705,10 +9754,6 @@ msgstr "Dialog"
 msgid "Pad properties"
 msgstr "Propri�t�s des Pads"
 
-#: pcbnew/dialog_netlist.h:40
-msgid "Netlist: "
-msgstr "Netliste: "
-
 #: pcbnew/dialog_general_options.h:44
 #: eeschema/dialog_options.h:55
 msgid "General Options"
@@ -9782,9 +9827,9 @@ msgstr "Afficher Modules Cmp"
 msgid "Show Modules Cu"
 msgstr "Afficher Modules Cu"
 
-#: pcbnew/dialog_drc.h:56
-msgid "DRC Control"
-msgstr "Controle ERC"
+#: pcbnew/dialog_netlist.h:52
+msgid "Netlist: "
+msgstr "Netliste: "
 
 #: pcbnew/dialog_track_options.h:42
 msgid "Tracks and Vias Sizes"
@@ -9802,6 +9847,90 @@ msgstr "EESchema Trac
 msgid "Pin properties"
 msgstr "Propri�t�s des Pins"
 
+#: eeschema/eelayer.h:35
+msgid "EESchema Colors"
+msgstr "Couleurs dans EESchema"
+
+#: eeschema/eelayer.h:74
+msgid "Wire"
+msgstr "Fil"
+
+#: eeschema/eelayer.h:80
+msgid "Bus"
+msgstr "Bus"
+
+#: eeschema/eelayer.h:86
+msgid "Junction"
+msgstr "Jonction"
+
+#: eeschema/eelayer.h:92
+msgid "Label"
+msgstr "Label"
+
+#: eeschema/eelayer.h:98
+msgid "GlobLabel"
+msgstr "Lab Global"
+
+#: eeschema/eelayer.h:110
+msgid "Notes"
+msgstr "Notes"
+
+#: eeschema/eelayer.h:123
+msgid "Body"
+msgstr "Body"
+
+#: eeschema/eelayer.h:129
+msgid "Body Bg"
+msgstr "Body Bg"
+
+#: eeschema/eelayer.h:135
+msgid "Pin"
+msgstr "Pin"
+
+#: eeschema/eelayer.h:147
+msgid "PinNam"
+msgstr "Nom Pin"
+
+#: eeschema/eelayer.h:178
+msgid "Sheetfile"
+msgstr "Fichier feuille"
+
+#: eeschema/eelayer.h:184
+msgid "SheetName"
+msgstr "Nom feuille"
+
+#: eeschema/eelayer.h:190
+msgid "SheetLabel"
+msgstr "SheetLabel"
+
+#: eeschema/eelayer.h:197
+msgid "Erc Warning"
+msgstr "ERC Warning"
+
+#: eeschema/eelayer.h:203
+msgid "Erc Error"
+msgstr "ERC Erreur"
+
+#: eeschema/eelayer.h:248
+msgid "General"
+msgstr " G�n�ral  "
+
+#: eeschema/eelayer.h:254
+msgid "Device"
+msgstr "Composant"
+
+#: eeschema/eelayer.h:260
+msgid "Sheets"
+msgstr "Feuilles"
+
+#: eeschema/eelayer.h:266
+msgid "Erc Mark"
+msgstr "Marqueur ERC"
+
+#: eeschema/eelayer.h:272
+msgid "Other"
+msgstr "Autre"
+
 #: eeschema/dialog_erc.h:57
 msgid "EESchema Erc"
 msgstr "EESchema Erc"
@@ -9818,90 +9947,6 @@ msgstr "Num
 msgid "List of Material"
 msgstr "Liste du Mat�riel"
 
-#: eeschema/eelayer.h:34
-msgid "EESchema Colors"
-msgstr "Couleurs dans EESchema"
-
-#: eeschema/eelayer.h:73
-msgid "Wire"
-msgstr "Fil"
-
-#: eeschema/eelayer.h:79
-msgid "Bus"
-msgstr "Bus"
-
-#: eeschema/eelayer.h:85
-msgid "Junction"
-msgstr "Jonction"
-
-#: eeschema/eelayer.h:91
-msgid "Label"
-msgstr "Label"
-
-#: eeschema/eelayer.h:97
-msgid "GlobLabel"
-msgstr "Lab Global"
-
-#: eeschema/eelayer.h:109
-msgid "Notes"
-msgstr "Notes"
-
-#: eeschema/eelayer.h:122
-msgid "Body"
-msgstr "Body"
-
-#: eeschema/eelayer.h:128
-msgid "Body Bg"
-msgstr "Body Bg"
-
-#: eeschema/eelayer.h:134
-msgid "Pin"
-msgstr "Pin"
-
-#: eeschema/eelayer.h:146
-msgid "PinNam"
-msgstr "Nom Pin"
-
-#: eeschema/eelayer.h:177
-msgid "Sheetfile"
-msgstr "Fichier feuille"
-
-#: eeschema/eelayer.h:183
-msgid "SheetName"
-msgstr "Nom feuille"
-
-#: eeschema/eelayer.h:189
-msgid "SheetLabel"
-msgstr "SheetLabel"
-
-#: eeschema/eelayer.h:196
-msgid "Erc Warning"
-msgstr "ERC Warning"
-
-#: eeschema/eelayer.h:202
-msgid "Erc Error"
-msgstr "ERC Erreur"
-
-#: eeschema/eelayer.h:247
-msgid "General"
-msgstr " G�n�ral  "
-
-#: eeschema/eelayer.h:253
-msgid "Device"
-msgstr "Composant"
-
-#: eeschema/eelayer.h:259
-msgid "Sheets"
-msgstr "Feuilles"
-
-#: eeschema/eelayer.h:265
-msgid "Erc Mark"
-msgstr "Marqueur ERC"
-
-#: eeschema/eelayer.h:271
-msgid "Other"
-msgstr "Autre"
-
 #: eeschema/dialog_edit_component_in_schematic.h:52
 msgid "Component properties"
 msgstr "Propri�t�s du composant"
@@ -9914,7 +9959,7 @@ msgstr "Propri
 msgid "Graphic text properties"
 msgstr "Propri�t�s du texte"
 
-#: eeschema/dialog_create_component.h:45
+#: eeschema/dialog_create_component.h:55
 msgid "Component Creation"
 msgstr "Creation Composant:"
 
@@ -9926,154 +9971,154 @@ msgstr "Propri
 msgid "Cvpcb Configuration"
 msgstr "Configuration de Cvpcb"
 
-#: gerbview/set_color.h:5
+#: gerbview/set_color.h:38
+msgid "GerbView Layer Colors:"
+msgstr "Gerbview: Couleur des couches"
+
+#: gerbview/set_color.h:80
 msgid "Layers 1-16"
 msgstr "Couches 1-16"
 
-#: gerbview/set_color.h:10
+#: gerbview/set_color.h:86
 msgid "Layer 1"
 msgstr "Couche 1"
 
-#: gerbview/set_color.h:17
+#: gerbview/set_color.h:93
 msgid "Layer 2"
 msgstr "Couche 2"
 
-#: gerbview/set_color.h:24
+#: gerbview/set_color.h:100
 msgid "Layer 3"
 msgstr "Couche 3"
 
-#: gerbview/set_color.h:31
+#: gerbview/set_color.h:107
 msgid "Layer 4"
 msgstr "Couche 4"
 
-#: gerbview/set_color.h:38
+#: gerbview/set_color.h:114
 msgid "Layer 5"
 msgstr "Couche 5"
 
-#: gerbview/set_color.h:45
+#: gerbview/set_color.h:121
 msgid "Layer 6"
 msgstr "Couche 6"
 
-#: gerbview/set_color.h:52
+#: gerbview/set_color.h:128
 msgid "Layer 7"
 msgstr "Couche 7"
 
-#: gerbview/set_color.h:59
+#: gerbview/set_color.h:135
 msgid "Layer 8"
 msgstr "Couche 8"
 
-#: gerbview/set_color.h:66
+#: gerbview/set_color.h:142
 msgid "Layer 9"
 msgstr "Couche 9"
 
-#: gerbview/set_color.h:73
+#: gerbview/set_color.h:149
 msgid "Layer 10"
 msgstr "Couche 10"
 
-#: gerbview/set_color.h:80
+#: gerbview/set_color.h:156
 msgid "Layer 11"
 msgstr "Couche 11"
 
-#: gerbview/set_color.h:87
+#: gerbview/set_color.h:163
 msgid "Layer 12"
 msgstr "Couche 12"
 
-#: gerbview/set_color.h:94
+#: gerbview/set_color.h:170
 msgid "Layer 13"
 msgstr "Couche 13"
 
-#: gerbview/set_color.h:101
+#: gerbview/set_color.h:177
 msgid "Layer 14"
 msgstr "Couche 14"
 
-#: gerbview/set_color.h:108
+#: gerbview/set_color.h:184
 msgid "Layer 15"
 msgstr "Couche 15"
 
-#: gerbview/set_color.h:115
+#: gerbview/set_color.h:191
 msgid "Layer 16"
 msgstr "Couche 16"
 
-#: gerbview/set_color.h:122
+#: gerbview/set_color.h:199
 msgid "Layers 17-32"
 msgstr "Couches 17-32"
 
-#: gerbview/set_color.h:127
+#: gerbview/set_color.h:205
 msgid "Layer 17"
 msgstr "Couche 17"
 
-#: gerbview/set_color.h:134
+#: gerbview/set_color.h:212
 msgid "Layer 18"
 msgstr "Couche 18"
 
-#: gerbview/set_color.h:141
+#: gerbview/set_color.h:219
 msgid "Layer 19"
 msgstr "Couche 19"
 
-#: gerbview/set_color.h:148
+#: gerbview/set_color.h:226
 msgid "Layer 20"
 msgstr "Couche 20"
 
-#: gerbview/set_color.h:155
+#: gerbview/set_color.h:233
 msgid "Layer 21"
 msgstr "Couche 21"
 
-#: gerbview/set_color.h:162
+#: gerbview/set_color.h:240
 msgid "Layer 22"
 msgstr "Couche 22"
 
-#: gerbview/set_color.h:169
+#: gerbview/set_color.h:247
 msgid "Layer 23"
 msgstr "Couche 23"
 
-#: gerbview/set_color.h:176
+#: gerbview/set_color.h:254
 msgid "Layer 24"
 msgstr "Couche 24"
 
-#: gerbview/set_color.h:183
+#: gerbview/set_color.h:261
 msgid "Layer 25"
 msgstr "Couche 25"
 
-#: gerbview/set_color.h:190
+#: gerbview/set_color.h:268
 msgid "Layer 26"
 msgstr "Couche 26"
 
-#: gerbview/set_color.h:197
+#: gerbview/set_color.h:275
 msgid "Layer 27"
 msgstr "Couche 26"
 
-#: gerbview/set_color.h:204
+#: gerbview/set_color.h:282
 msgid "Layer 28"
 msgstr "Couche 28"
 
-#: gerbview/set_color.h:211
+#: gerbview/set_color.h:289
 msgid "Layer 29"
 msgstr "Couche 29"
 
-#: gerbview/set_color.h:218
+#: gerbview/set_color.h:296
 msgid "Layer 30"
 msgstr "Couche 30"
 
-#: gerbview/set_color.h:225
+#: gerbview/set_color.h:303
 msgid "Layer 31"
 msgstr "Couche 31"
 
-#: gerbview/set_color.h:232
+#: gerbview/set_color.h:310
 msgid "Layer 32"
 msgstr "Couche 32"
 
-#: gerbview/set_color.h:240
+#: gerbview/set_color.h:318
 msgid "Others"
 msgstr "Autres"
 
-#: gerbview/set_color.h:254
+#: gerbview/set_color.h:332
 msgid "D codes id."
 msgstr "DCodes id."
 
-#: share/setpage.h:54
-msgid "Page Settings"
-msgstr "Ajustage opt Page"
-
 #: share/svg_print.h:50
 msgid "Create SVG file"
 msgstr "Cr�er Fichier SVG"
@@ -10082,3 +10127,7 @@ msgstr "Cr
 msgid "Print"
 msgstr "Imprimer"
 
+#: share/setpage.h:84
+msgid "Page Settings"
+msgstr "Ajustage opt Page"
+
diff --git a/pcbnew/pcbcfg.cpp b/pcbnew/pcbcfg.cpp
index 458162bd51..13edaffdf6 100644
--- a/pcbnew/pcbcfg.cpp
+++ b/pcbnew/pcbcfg.cpp
@@ -111,6 +111,10 @@ wxString FullFileName;
 			HandleHotkeyConfigMenuSelection( this, id );
 			break;
 
+		case ID_PREFERENCES_HOTKEY_SHOW_CURRENT_LIST:       // Display Current hotkey list for eeschema
+			DisplayHotkeyList( this, s_Board_Editor_Hokeys_Descr );
+			break;
+
 		default:
 			DisplayError(this, wxT("WinEDA_PcbFrame::Process_Config internal error"));
 		}