diff --git a/eeschema/dialog_edit_component_in_schematic.cpp b/eeschema/dialog_edit_component_in_schematic.cpp
index 829e614e20..589737b249 100644
--- a/eeschema/dialog_edit_component_in_schematic.cpp
+++ b/eeschema/dialog_edit_component_in_schematic.cpp
@@ -371,6 +371,12 @@ int DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::getSelectedFieldNdx()
 }
 
 
+
+static bool SortFieldsById(const SCH_CMP_FIELD& item1, const SCH_CMP_FIELD& item2)
+{
+    return item1.m_FieldId < item2.m_FieldId;
+}
+
 /*******************************************************************************/
 void DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::InitBuffers( SCH_COMPONENT* aComponent )
 /*******************************************************************************/
@@ -391,6 +397,9 @@ void DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::InitBuffers( SCH_COMPONENT* aComponent
     // copy all the fields to a work area
     m_FieldsBuf = aComponent->m_Fields;
 
+    // Sort files by field id,if they are not entered by id
+    sort(m_FieldsBuf.begin(), m_FieldsBuf.end(), SortFieldsById);
+
 #if 0 && defined(DEBUG)
     for( unsigned i = 0;  i<m_FieldsBuf.size();  ++i )
     {
diff --git a/eeschema/dialog_edit_libentry_fields_in_lib.cpp b/eeschema/dialog_edit_libentry_fields_in_lib.cpp
index a6e47a3e10..7a21454805 100644
--- a/eeschema/dialog_edit_libentry_fields_in_lib.cpp
+++ b/eeschema/dialog_edit_libentry_fields_in_lib.cpp
@@ -392,7 +392,7 @@ int DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB::getSelectedFieldNdx()
 }
 
 
-bool SortFieldsById(const LibDrawField& item1, const LibDrawField& item2)
+static bool SortFieldsById(const LibDrawField& item1, const LibDrawField& item2)
 {
     return item1.m_FieldId < item2.m_FieldId;
 }
@@ -428,7 +428,7 @@ void DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB::InitBuffers( void )
 
     m_FieldsBuf[VALUE].m_Name << wxT( "/" ) << _( "Chip Name" );
 
-     // Sort files by field id, because they are not entered by id
+    // Sort files by field id, because they are not entered by id
     sort(m_FieldsBuf.begin(), m_FieldsBuf.end(), SortFieldsById);
 
     // Now, all fields with Id  0 to NUMBER_OF_FIELDS-1 exist
diff --git a/eeschema/eelibs_read_libraryfiles.cpp b/eeschema/eelibs_read_libraryfiles.cpp
index 07f5533b84..7156879ec4 100644
--- a/eeschema/eelibs_read_libraryfiles.cpp
+++ b/eeschema/eelibs_read_libraryfiles.cpp
@@ -101,8 +101,7 @@ LibraryStruct* LoadLibraryName( WinEDA_DrawFrame* frame,
 
 
 /******************************************/
-void
-LoadLibraries (WinEDA_DrawFrame* frame)
+void LoadLibraries (WinEDA_DrawFrame* frame)
 /******************************************/
 
 /* Function LoadLibraries
@@ -204,9 +203,7 @@ LoadLibraries (WinEDA_DrawFrame* frame)
 
 
 /**************************************************************/
-void
-FreeCmpLibrary (wxWindow* frame,
-                const wxString& LibName)
+void FreeCmpLibrary (wxWindow* frame, const wxString& LibName)
 /**************************************************************/
 
 /** Function FreeCmpLibrary
@@ -252,8 +249,7 @@ FreeCmpLibrary (wxWindow* frame,
 
 
 /******************************/
-const
-wxChar** GetLibNames()
+const wxChar** GetLibNames()
 /******************************/
 
 /** GetLibNames()
@@ -281,9 +277,7 @@ wxChar** GetLibNames()
  * Routine to compare two EDA_LibComponentStruct for the PriorQue module.
  * Comparison (insensitive  case) is based on Part name.
  */
-int
-LibraryEntryCompare (EDA_LibComponentStruct* LE1,
-                     EDA_LibComponentStruct* LE2)
+int LibraryEntryCompare (EDA_LibComponentStruct* LE1, EDA_LibComponentStruct* LE2)
 {
     return LE1->m_Name.m_Text.CmpNoCase( LE2->m_Name.m_Text );
 }
@@ -953,9 +947,6 @@ static bool GetLibEntryField (EDA_LibComponentStruct* LibEntry,
         break;
 
     default:
-        if( NumOfField >= NUMBER_OF_FIELDS )
-            break;
-
         Field = new LibDrawField( NumOfField );
         LibEntry->m_Fields.PushBack( Field );
         break;
diff --git a/eeschema/getpart.cpp b/eeschema/getpart.cpp
index 630a15909a..cef2b1eeed 100644
--- a/eeschema/getpart.cpp
+++ b/eeschema/getpart.cpp
@@ -67,10 +67,9 @@ SCH_COMPONENT* WinEDA_SchematicFrame::Load_Component( wxDC*           DC,
  */
 {
     int                     ii, CmpCount = 0;
-    LibDrawField*           Field;
-    EDA_LibComponentStruct* Entry = NULL;
-    SCH_COMPONENT*          DrawLibItem = NULL;
-    LibraryStruct*          Library     = NULL;
+    EDA_LibComponentStruct* Entry     = NULL;
+    SCH_COMPONENT*          Component = NULL;
+    LibraryStruct*          Library   = NULL;
     wxString                Name, keys, msg;
     bool                    AllowWildSeach = TRUE;
 
@@ -176,17 +175,17 @@ SCH_COMPONENT* WinEDA_SchematicFrame::Load_Component( wxDC*           DC,
     DrawPanel->ManageCurseur = ShowWhileMoving;
     DrawPanel->ForceCloseManageCurseur = ExitPlaceCmp;
 
-    DrawLibItem = new SCH_COMPONENT( GetScreen()->m_Curseur );
-    DrawLibItem->m_Multi     = 1; /* Selection de l'unite 1 dans le boitier */
-    DrawLibItem->m_Convert   = 1;
-    DrawLibItem->m_ChipName  = Name;
-    DrawLibItem->m_TimeStamp = GetTimeStamp();
-    DrawLibItem->m_Flags     = IS_NEW | IS_MOVED;
+    Component = new SCH_COMPONENT( GetScreen()->m_Curseur );
+    Component->m_Multi     = 1; /* Selection de l'unite 1 dans le boitier */
+    Component->m_Convert   = 1;
+    Component->m_ChipName  = Name;
+    Component->m_TimeStamp = GetTimeStamp();
+    Component->m_Flags     = IS_NEW | IS_MOVED;
 
     /* Init champ Valeur */
-    DrawLibItem->GetField( VALUE )->m_Pos       = Entry->m_Name.m_Pos + DrawLibItem->m_Pos;
-    DrawLibItem->GetField( VALUE )->ImportValues( Entry->m_Name );
-    DrawLibItem->GetField( VALUE )->m_Text      = DrawLibItem->m_ChipName;
+    Component->GetField( VALUE )->m_Pos = Entry->m_Name.m_Pos + Component->m_Pos;
+    Component->GetField( VALUE )->ImportValues( Entry->m_Name );
+    Component->GetField( VALUE )->m_Text = Component->m_ChipName;
 
     msg = Entry->m_Prefix.m_Text;
     if( msg.IsEmpty() )
@@ -194,40 +193,48 @@ SCH_COMPONENT* WinEDA_SchematicFrame::Load_Component( wxDC*           DC,
     msg += wxT( "?" );
 
     // update the reference -- just the prefix for now.
-    DrawLibItem->SetRef( GetSheet(), msg );
+    Component->SetRef( GetSheet(), msg );
 
     /* Init champ Reference */
-    DrawLibItem->GetField( REFERENCE )->m_Pos = Entry->m_Prefix.m_Pos + DrawLibItem->m_Pos;
-    DrawLibItem->GetField( REFERENCE )->ImportValues( Entry->m_Prefix );
-    DrawLibItem->m_PrefixString = Entry->m_Prefix.m_Text;
+    Component->GetField( REFERENCE )->m_Pos = Entry->m_Prefix.m_Pos + Component->m_Pos;
+    Component->GetField( REFERENCE )->ImportValues( Entry->m_Prefix );
+    Component->m_PrefixString = Entry->m_Prefix.m_Text;
 
     /* Init des autres champs si predefinis dans la librairie */
-    for( Field = Entry->m_Fields; Field != NULL; Field = Field->Next() )
+    LibDrawField* EntryField;
+    for( EntryField = Entry->m_Fields; EntryField != NULL; EntryField = EntryField->Next() )
     {
-        if( Field->m_Text.IsEmpty() && Field->m_Name.IsEmpty() )
+        if( EntryField->m_Text.IsEmpty() && EntryField->m_Name.IsEmpty() )
             continue;
 
-        ii = Field->m_FieldId;
+        ii = EntryField->m_FieldId;
         if( ii < 2 )        // Reference or value, already done
             continue;
 
-        if( ii >= DrawLibItem->GetFieldCount() )
-            continue;
+        if( ii >= Component->GetFieldCount() )
+        {   // This entry has more than the default count: add extra fields
+            while( ii >= Component->GetFieldCount() )
+            {
+                int field_id = Component->GetFieldCount();
+                SCH_CMP_FIELD field( wxPoint( 0, 0 ), field_id, Component, ReturnDefaultFieldName( ii ) );
+                Component->AddField( field );
+            }
+        }
 
-        SCH_CMP_FIELD* f = DrawLibItem->GetField( ii );
+        SCH_CMP_FIELD* curr_field = Component->GetField( ii );
 
-        f->m_Pos += Field->m_Pos;
-        f->ImportValues( *Field );
-        f->m_Text     = Field->m_Text;
-        f->m_Name     = Field->m_Name;
+        curr_field->m_Pos = Component->m_Pos + EntryField->m_Pos;
+        curr_field->ImportValues( *EntryField );
+        curr_field->m_Text = EntryField->m_Text;
+        curr_field->m_Name = ( ii < FIELD1 ) ? ReturnDefaultFieldName( ii ) : EntryField->m_Name;
     }
 
-    DrawStructsInGhost( DrawPanel, DC, DrawLibItem, 0, 0 );
+    DrawStructsInGhost( DrawPanel, DC, Component, 0, 0 );
 
     MsgPanel->EraseMsgBox();
-    DrawLibItem->Display_Infos( this );
+    Component->Display_Infos( this );
 
-    return DrawLibItem;
+    return Component;
 }
 
 
@@ -241,19 +248,19 @@ static void ShowWhileMoving( WinEDA_DrawPanel* panel, wxDC* DC, bool erase )
 
     SCH_SCREEN*    screen = (SCH_SCREEN*) panel->GetScreen();
 
-    SCH_COMPONENT* DrawLibItem = (SCH_COMPONENT*) screen->GetCurItem();
+    SCH_COMPONENT* Component = (SCH_COMPONENT*) screen->GetCurItem();
 
     /* Effacement du composant */
     if( erase )
     {
-        DrawStructsInGhost( panel, DC, DrawLibItem, 0, 0 );
+        DrawStructsInGhost( panel, DC, Component, 0, 0 );
     }
 
-    move_vector.x = screen->m_Curseur.x - DrawLibItem->m_Pos.x;
-    move_vector.y = screen->m_Curseur.y - DrawLibItem->m_Pos.y;
-    MoveOneStruct( DrawLibItem, move_vector );
+    move_vector.x = screen->m_Curseur.x - Component->m_Pos.x;
+    move_vector.y = screen->m_Curseur.y - Component->m_Pos.y;
+    MoveOneStruct( Component, move_vector );
 
-    DrawStructsInGhost( panel, DC, DrawLibItem, 0, 0 );
+    DrawStructsInGhost( panel, DC, Component, 0, 0 );
 }
 
 
@@ -309,25 +316,25 @@ static void ExitPlaceCmp( WinEDA_DrawPanel* Panel, wxDC* DC )
 {
     SCH_SCREEN*    screen = (SCH_SCREEN*) Panel->GetScreen();
 
-    SCH_COMPONENT* DrawLibItem = (SCH_COMPONENT*) screen->GetCurItem();
+    SCH_COMPONENT* Component = (SCH_COMPONENT*) screen->GetCurItem();
 
-    if( DrawLibItem->m_Flags & IS_NEW )    /* Nouveau Placement en cours, on l'efface */
+    if( Component->m_Flags & IS_NEW )    /* Nouveau Placement en cours, on l'efface */
     {
-        DrawLibItem->m_Flags = 0;
-        SAFE_DELETE( DrawLibItem );
+        Component->m_Flags = 0;
+        SAFE_DELETE( Component );
     }
-    else if( DrawLibItem )   /* Deplacement ancien composant en cours */
+    else if( Component )   /* Deplacement ancien composant en cours */
     {
         wxPoint move_vector;
 
-        move_vector.x = OldPos.x - DrawLibItem->m_Pos.x;
-        move_vector.y = OldPos.y - DrawLibItem->m_Pos.y;
+        move_vector.x = OldPos.x - Component->m_Pos.x;
+        move_vector.y = OldPos.y - Component->m_Pos.y;
 
-        MoveOneStruct( DrawLibItem, move_vector );
+        MoveOneStruct( Component, move_vector );
 
-        memcpy( DrawLibItem->m_Transform, OldTransMat, sizeof(OldTransMat) );
+        memcpy( Component->m_Transform, OldTransMat, sizeof(OldTransMat) );
 
-        DrawLibItem->m_Flags = 0;
+        Component->m_Flags = 0;
     }
 
     Panel->Refresh( TRUE );
diff --git a/gerbview/rs274d.cpp b/gerbview/rs274d.cpp
index 0d28d34431..1b3550e75f 100644
--- a/gerbview/rs274d.cpp
+++ b/gerbview/rs274d.cpp
@@ -72,8 +72,6 @@
 #define GERB_STOP_DRAW   2      // extinction de lumiere ( lever de plume)
 #define GERB_FLASH       3      // Flash
 
-#define NEGATE( nb ) (nb) = -(nb)
-
 /* Variables locales : */
 static wxPoint LastPosition;
 
diff --git a/internat/fr/kicad.mo b/internat/fr/kicad.mo
index 1cc95f7114..7c87695024 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 99f3df0df3..7219ef36f1 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: 2008-12-29 09:07+0100\n"
-"PO-Revision-Date: 2008-12-29 16:04+0100\n"
+"POT-Creation-Date: 2008-12-31 16:42+0100\n"
+"PO-Revision-Date: 2008-12-31 16:46+0100\n"
 "Last-Translator: \n"
 "Language-Team: kicad team <jean-pierre.charras@ujf-grenoble.fr>\n"
 "MIME-Version: 1.0\n"
@@ -774,7 +774,6 @@ msgid "Orient"
 msgstr "Orient"
 
 #: pcbnew/class_pcb_text.cpp:195
-#: pcbnew/class_edge_mod.cpp:271
 msgid "Width"
 msgstr "Epaisseur"
 
@@ -991,7 +990,6 @@ msgid "Reference"
 msgstr "Référence"
 
 #: pcbnew/class_board_item.cpp:106
-#: pcbnew/class_edge_mod.cpp:261
 msgid "Value"
 msgstr "Valeur"
 
@@ -1104,26 +1102,6 @@ msgstr "Epaisseur Contour"
 msgid "Incorrect number, no change"
 msgstr "Nombre incorrect, pas de changement"
 
-#: pcbnew/class_edge_mod.cpp:258
-msgid "Seg"
-msgstr "Seg"
-
-#: pcbnew/class_edge_mod.cpp:260
-msgid "Module"
-msgstr "Module"
-
-#: pcbnew/class_edge_mod.cpp:264
-msgid "TimeStamp"
-msgstr "TimeStamp"
-
-#: pcbnew/class_edge_mod.cpp:266
-msgid "Mod Layer"
-msgstr "Couche Mod."
-
-#: pcbnew/class_edge_mod.cpp:268
-msgid "Seg Layer"
-msgstr "Couche Seg."
-
 #: pcbnew/modules.cpp:81
 msgid "Search footprint"
 msgstr "Cherche Module"
@@ -1643,6 +1621,10 @@ msgstr "Chemin Netliste "
 msgid "Stat"
 msgstr "Stat"
 
+#: pcbnew/class_module.cpp:959
+msgid "Module"
+msgstr "Module"
+
 #: pcbnew/class_module.cpp:962
 msgid "3D-Shape"
 msgstr "Forme 3D"
@@ -1715,6 +1697,33 @@ msgstr "Déplacer Bloc"
 msgid "Copy Block"
 msgstr "Copie Bloc"
 
+#: pcbnew/plot_rtn.cpp:210
+#, c-format
+msgid ""
+"Your BOARD has a bad layer number of %u for module\n"
+" %s's \"reference\" text."
+msgstr ""
+"Votre PCB a un mauvais numero de couche  %u pour le module\n"
+" %s's \"reference\"."
+
+#: pcbnew/plot_rtn.cpp:230
+#, c-format
+msgid ""
+"Your BOARD has a bad layer number of %u for module\n"
+" %s's \"value\" text."
+msgstr ""
+"Votre PCB a un mauvais numero de couche %u pour le module\n"
+" %s's \"valeur\"."
+
+#: pcbnew/plot_rtn.cpp:276
+#, c-format
+msgid ""
+"Your BOARD has a bad layer number of %u for module\n"
+" %s's \"module text\" text of %s."
+msgstr ""
+"Votre PCB a un mauvais numero de couche  %u pour le module\n"
+" %s's \"texte module\" de %s."
+
 #: pcbnew/dialog_graphic_items_options.cpp:194
 msgid "Graphics:"
 msgstr "Eléments graphiques;"
@@ -3442,97 +3451,6 @@ msgstr "Epais. Piste"
 msgid "Mask clearance"
 msgstr "Retrait Masque"
 
-#: pcbnew/muonde.cpp:134
-msgid "Gap"
-msgstr "Gap"
-
-#: pcbnew/muonde.cpp:139
-msgid "Stub"
-msgstr "Stub"
-
-#: pcbnew/muonde.cpp:145
-msgid "Arc Stub"
-msgstr "Arc Stub"
-
-#: pcbnew/muonde.cpp:160
-msgid " (mm):"
-msgstr " (mm):"
-
-#: pcbnew/muonde.cpp:166
-msgid " (inch):"
-msgstr " (pouce):"
-
-#: pcbnew/muonde.cpp:168
-#: pcbnew/muonde.cpp:183
-msgid "Create microwave module"
-msgstr "Créer Module MicroOnde"
-
-#: pcbnew/muonde.cpp:173
-#: pcbnew/muonde.cpp:186
-msgid "Incorrect number, abort"
-msgstr "Nombre incorrect, arret"
-
-#: pcbnew/muonde.cpp:182
-msgid "Angle (0.1deg):"
-msgstr "Angle (0.1deg):"
-
-#: pcbnew/muonde.cpp:314
-msgid "Complex shape"
-msgstr "Formr complexe"
-
-#: pcbnew/muonde.cpp:340
-msgid "Read Shape Descr File..."
-msgstr "Lire fichier de description de forme..."
-
-#: pcbnew/muonde.cpp:344
-msgid "Symmetrical"
-msgstr "Symétrique"
-
-#: pcbnew/muonde.cpp:344
-msgid "Mirrored"
-msgstr "Miroir"
-
-#: pcbnew/muonde.cpp:346
-msgid "Shape Option"
-msgstr "Option Forme"
-
-#: pcbnew/muonde.cpp:412
-msgid "Read descr shape file"
-msgstr "Lire fichier de description de forme"
-
-#: pcbnew/muonde.cpp:428
-msgid "File not found"
-msgstr "fichier non trouvé"
-
-#: pcbnew/muonde.cpp:532
-msgid "Shape has a null size!"
-msgstr "La forme a une taille nulle"
-
-#: pcbnew/muonde.cpp:537
-msgid "Shape has no points!"
-msgstr "La forme n'a pas de points"
-
-#: pcbnew/muonde.cpp:663
-msgid "No pad for this module"
-msgstr "Pas de pad dans ce module"
-
-#: pcbnew/muonde.cpp:668
-msgid "Only one pad for this module"
-msgstr "Seulement un pad dans ce module"
-
-#: pcbnew/muonde.cpp:682
-msgid "Gap (mm):"
-msgstr "Gap (mm):"
-
-#: pcbnew/muonde.cpp:682
-#: pcbnew/muonde.cpp:688
-msgid "Create Microwave Gap"
-msgstr "Créer Gap MicroOnde "
-
-#: pcbnew/muonde.cpp:688
-msgid "Gap (inch):"
-msgstr "Gap (inch):"
-
 #: pcbnew/sel_layer.cpp:92
 msgid "Select Layer:"
 msgstr "Sélection couche:"
@@ -3586,41 +3504,21 @@ msgstr "N'affiche pas les couches cuivre"
 msgid "Apply"
 msgstr "Appliquer"
 
-#: pcbnew/class_zone.cpp:889
-msgid "NetName"
-msgstr "NetName"
+#: pcbnew/class_edge_mod.cpp:242
+msgid "Seg"
+msgstr "Seg"
 
-#: pcbnew/class_zone.cpp:892
-msgid "Non Copper Zone"
-msgstr "Zone non Cuivre"
+#: pcbnew/class_edge_mod.cpp:248
+msgid "TimeStamp"
+msgstr "TimeStamp"
 
-#: pcbnew/class_zone.cpp:897
-msgid "NetCode"
-msgstr "NetCode"
+#: pcbnew/class_edge_mod.cpp:250
+msgid "Mod Layer"
+msgstr "Couche Mod."
 
-#: pcbnew/class_zone.cpp:905
-msgid "Corners"
-msgstr "Sommets"
-
-#: pcbnew/class_zone.cpp:909
-msgid "Segments"
-msgstr "Segments"
-
-#: pcbnew/class_zone.cpp:911
-msgid "Polygons"
-msgstr "Polygones"
-
-#: pcbnew/class_zone.cpp:912
-msgid "Fill mode"
-msgstr "Mode de remplissage"
-
-#: pcbnew/class_zone.cpp:917
-msgid "Hatch lines"
-msgstr "Lignes de Hachure"
-
-#: pcbnew/class_zone.cpp:923
-msgid "Corners in DrawList"
-msgstr "Sommets en Liste de dessin"
+#: pcbnew/class_edge_mod.cpp:252
+msgid "Seg Layer"
+msgstr "Couche Seg."
 
 #: pcbnew/cross-probing.cpp:61
 #, c-format
@@ -3643,6 +3541,97 @@ msgstr "%s pin %s non trouvée"
 msgid "%s pin %s found"
 msgstr "%s pin %s trouvée"
 
+#: pcbnew/muonde.cpp:134
+msgid "Gap"
+msgstr "Gap"
+
+#: pcbnew/muonde.cpp:139
+msgid "Stub"
+msgstr "Stub"
+
+#: pcbnew/muonde.cpp:145
+msgid "Arc Stub"
+msgstr "Arc Stub"
+
+#: pcbnew/muonde.cpp:160
+msgid " (mm):"
+msgstr " (mm):"
+
+#: pcbnew/muonde.cpp:166
+msgid " (inch):"
+msgstr " (pouce):"
+
+#: pcbnew/muonde.cpp:168
+#: pcbnew/muonde.cpp:183
+msgid "Create microwave module"
+msgstr "Créer Module MicroOnde"
+
+#: pcbnew/muonde.cpp:173
+#: pcbnew/muonde.cpp:186
+msgid "Incorrect number, abort"
+msgstr "Nombre incorrect, arret"
+
+#: pcbnew/muonde.cpp:182
+msgid "Angle (0.1deg):"
+msgstr "Angle (0.1deg):"
+
+#: pcbnew/muonde.cpp:313
+msgid "Complex shape"
+msgstr "Formr complexe"
+
+#: pcbnew/muonde.cpp:339
+msgid "Read Shape Descr File..."
+msgstr "Lire fichier de description de forme..."
+
+#: pcbnew/muonde.cpp:343
+msgid "Symmetrical"
+msgstr "Symétrique"
+
+#: pcbnew/muonde.cpp:343
+msgid "Mirrored"
+msgstr "Miroir"
+
+#: pcbnew/muonde.cpp:345
+msgid "Shape Option"
+msgstr "Option Forme"
+
+#: pcbnew/muonde.cpp:411
+msgid "Read descr shape file"
+msgstr "Lire fichier de description de forme"
+
+#: pcbnew/muonde.cpp:427
+msgid "File not found"
+msgstr "fichier non trouvé"
+
+#: pcbnew/muonde.cpp:534
+msgid "Shape has a null size!"
+msgstr "La forme a une taille nulle"
+
+#: pcbnew/muonde.cpp:539
+msgid "Shape has no points!"
+msgstr "La forme n'a pas de points"
+
+#: pcbnew/muonde.cpp:646
+msgid "No pad for this module"
+msgstr "Pas de pad dans ce module"
+
+#: pcbnew/muonde.cpp:651
+msgid "Only one pad for this module"
+msgstr "Seulement un pad dans ce module"
+
+#: pcbnew/muonde.cpp:665
+msgid "Gap (mm):"
+msgstr "Gap (mm):"
+
+#: pcbnew/muonde.cpp:665
+#: pcbnew/muonde.cpp:671
+msgid "Create Microwave Gap"
+msgstr "Créer Gap MicroOnde "
+
+#: pcbnew/muonde.cpp:671
+msgid "Gap (inch):"
+msgstr "Gap (inch):"
+
 #: pcbnew/basepcbframe.cpp:171
 msgid "3D Frame already opened"
 msgstr "Fenetre 3D déjà ouverte"
@@ -3712,33 +3701,6 @@ msgstr "Fichiers Librairies:"
 msgid "Library already in use"
 msgstr "Librairie déjà en usage"
 
-#: pcbnew/plot_rtn.cpp:210
-#, c-format
-msgid ""
-"Your BOARD has a bad layer number of %u for module\n"
-" %s's \"reference\" text."
-msgstr ""
-"Votre PCB a un mauvais numero de couche  %u pour le module\n"
-" %s's \"reference\"."
-
-#: pcbnew/plot_rtn.cpp:230
-#, c-format
-msgid ""
-"Your BOARD has a bad layer number of %u for module\n"
-" %s's \"value\" text."
-msgstr ""
-"Votre PCB a un mauvais numero de couche %u pour le module\n"
-" %s's \"valeur\"."
-
-#: pcbnew/plot_rtn.cpp:276
-#, c-format
-msgid ""
-"Your BOARD has a bad layer number of %u for module\n"
-" %s's \"module text\" text of %s."
-msgstr ""
-"Votre PCB a un mauvais numero de couche  %u pour le module\n"
-" %s's \"texte module\" de %s."
-
 #: pcbnew/dsn.cpp:502
 msgid "Line length exceeded"
 msgstr "Longueur de ligne dépassée"
@@ -4098,6 +4060,10 @@ msgstr "Erreur DRC: la fermeture de cette zone crée une erreur DRC avec une aut
 msgid "No Net"
 msgstr "No Net"
 
+#: pcbnew/zones_by_polygon.cpp:905
+msgid "NetName"
+msgstr "NetName"
+
 #: pcbnew/specctra_export.cpp:64
 msgid "Specctra DSN file:"
 msgstr "Fichier Specctra DSN"
@@ -4420,6 +4386,38 @@ msgstr "Le fichier Session a une 'reference' a un composant non existant \"%s\""
 msgid "A wire_via references a missing padstack \"%s\""
 msgstr "Une piste ou via  a une référence vers un  pad \"%s\" manquant"
 
+#: pcbnew/class_zone.cpp:882
+msgid "Non Copper Zone"
+msgstr "Zone non Cuivre"
+
+#: pcbnew/class_zone.cpp:887
+msgid "NetCode"
+msgstr "NetCode"
+
+#: pcbnew/class_zone.cpp:895
+msgid "Corners"
+msgstr "Sommets"
+
+#: pcbnew/class_zone.cpp:899
+msgid "Segments"
+msgstr "Segments"
+
+#: pcbnew/class_zone.cpp:901
+msgid "Polygons"
+msgstr "Polygones"
+
+#: pcbnew/class_zone.cpp:902
+msgid "Fill mode"
+msgstr "Mode de remplissage"
+
+#: pcbnew/class_zone.cpp:907
+msgid "Hatch lines"
+msgstr "Lignes de Hachure"
+
+#: pcbnew/class_zone.cpp:913
+msgid "Corners in DrawList"
+msgstr "Sommets en Liste de dessin"
+
 #: pcbnew/dialog_orient_footprints.cpp:147
 msgid "Orientation:"
 msgstr "Orientation:"
@@ -4931,6 +4929,7 @@ msgid "Offset Y"
 msgstr "Offset Y"
 
 #: pcbnew/dialog_edit_module_text_base.cpp:72
+#: eeschema/affiche.cpp:195
 msgid "Thickness"
 msgstr "Epaisseur"
 
@@ -5142,7 +5141,7 @@ msgstr "2 segments pour piste"
 
 #: pcbnew/dialog_general_options_BoardEditor_base.cpp:127
 msgid "If enabled, uses two track segments, with 45 degrees angle between them when creating a new track "
-msgstr ""
+msgstr "Si activé, utiliser 2 segments de piste, avec un angle de 45 degrés entre eux, pour créer une nouvelle piste"
 
 #: pcbnew/dialog_general_options_BoardEditor_base.cpp:136
 #: pcbnew/dialog_general_options_BoardEditor_base.cpp:144
@@ -5371,7 +5370,6 @@ msgid "Plot  "
 msgstr "Trace  "
 
 #: eeschema/affiche.cpp:22
-#: eeschema/dialog_create_component.cpp:160
 msgid "Name"
 msgstr "Nom"
 
@@ -5426,22 +5424,18 @@ msgid "Length"
 msgstr "Longueur"
 
 #: eeschema/affiche.cpp:102
-#: eeschema/pinedit-dialog.cpp:225
 msgid "Up"
 msgstr "Haut"
 
 #: eeschema/affiche.cpp:105
-#: eeschema/pinedit-dialog.cpp:226
 msgid "Down"
 msgstr "Bas"
 
 #: eeschema/affiche.cpp:108
-#: eeschema/pinedit-dialog.cpp:224
 msgid "Left"
 msgstr "Gauche"
 
 #: eeschema/affiche.cpp:111
-#: eeschema/pinedit-dialog.cpp:223
 msgid "Right"
 msgstr "Droite"
 
@@ -6082,39 +6076,39 @@ msgstr ""
 "Librairie \"%s\"  modifiée!\n"
 "Perdre les changements ?"
 
-#: eeschema/libframe.cpp:342
+#: eeschema/libframe.cpp:344
 msgid "Include last component changes?"
 msgstr "Inclure les dernieres modifs du composant"
 
-#: eeschema/libframe.cpp:405
+#: eeschema/libframe.cpp:411
 msgid " Pins Test OK!"
 msgstr " Test Pins OK!"
 
-#: eeschema/libframe.cpp:479
+#: eeschema/libframe.cpp:485
 msgid "Add Pin"
 msgstr "Addition de \"pins\""
 
-#: eeschema/libframe.cpp:483
+#: eeschema/libframe.cpp:489
 msgid "Set Pin Options"
 msgstr "Choix Options des Pins"
 
-#: eeschema/libframe.cpp:505
+#: eeschema/libframe.cpp:511
 msgid "Add Rectangle"
 msgstr "Addition de rectangles"
 
-#: eeschema/libframe.cpp:509
+#: eeschema/libframe.cpp:515
 msgid "Add Circle"
 msgstr "Addition de cercle"
 
-#: eeschema/libframe.cpp:513
+#: eeschema/libframe.cpp:519
 msgid "Add Arc"
 msgstr "Addition d' arc"
 
-#: eeschema/libframe.cpp:521
+#: eeschema/libframe.cpp:527
 msgid "Anchor"
 msgstr "Ancre"
 
-#: eeschema/libframe.cpp:531
+#: eeschema/libframe.cpp:537
 msgid "Export"
 msgstr "Exporter"
 
@@ -7005,27 +6999,31 @@ msgstr "Créer une nouvelle librairie et y sauver le composant"
 msgid "Edit component properties"
 msgstr "Editer propriétés du composant"
 
-#: eeschema/tool_lib.cpp:164
+#: eeschema/tool_lib.cpp:163
+msgid "Add, remove fields and edit fields properties"
+msgstr "Ajouter, supprimer des champs et editer leurs propriétés"
+
+#: eeschema/tool_lib.cpp:170
 msgid "Test duplicate pins"
 msgstr "Test duplicate pins"
 
-#: eeschema/tool_lib.cpp:186
+#: eeschema/tool_lib.cpp:192
 msgid "show as \"De Morgan\" normal part"
 msgstr "Afficher sous représentation normale"
 
-#: eeschema/tool_lib.cpp:192
+#: eeschema/tool_lib.cpp:198
 msgid "show as \"De Morgan\" convert part"
 msgstr "Afficher sous présentation \" De Morgan\""
 
-#: eeschema/tool_lib.cpp:201
+#: eeschema/tool_lib.cpp:207
 msgid "Documents"
 msgstr "Documents"
 
-#: eeschema/tool_lib.cpp:218
+#: eeschema/tool_lib.cpp:224
 msgid "Edit pins part per part (Carefully use!)"
 msgstr "Editer pins unité par unité (Utiliser en connaissance de cause)"
 
-#: eeschema/tool_lib.cpp:238
+#: eeschema/tool_lib.cpp:244
 #, c-format
 msgid "Part %c"
 msgstr "Composant %c"
@@ -7276,6 +7274,39 @@ msgstr " non trouvé"
 msgid "Eeschema is already running, Continue?"
 msgstr "Eeschema est en cours d'exécution. Continuer ?"
 
+#: 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: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:104
+msgid "Alias"
+msgstr "Alias"
+
 #: eeschema/menubar.cpp:41
 msgid "&New"
 msgstr "&Nouveau"
@@ -7689,151 +7720,86 @@ msgstr "Ext fichier Schema: "
 msgid " Default Path for libraries"
 msgstr "Chemin par défaut des librairies"
 
-#: eeschema/edit_component_in_lib.cpp:168
+#: eeschema/edit_component_in_lib.cpp:66
 msgid "Lib Component Properties"
 msgstr "Propriétés du composant librairie"
 
-#: eeschema/edit_component_in_lib.cpp:172
+#: eeschema/edit_component_in_lib.cpp:70
 msgid "Properties for "
 msgstr "Propriétés pour "
 
-#: eeschema/edit_component_in_lib.cpp:177
+#: eeschema/edit_component_in_lib.cpp:75
 msgid "(alias of "
 msgstr "(alias de "
 
+#: eeschema/edit_component_in_lib.cpp:133
 #: eeschema/edit_component_in_lib.cpp:216
-msgid "Alias"
-msgstr "Alias"
-
-#: eeschema/edit_component_in_lib.cpp:245
-#: eeschema/edit_component_in_lib.cpp:328
 msgid "Delete All"
 msgstr "Tout Supprimer"
 
-#: eeschema/edit_component_in_lib.cpp:281
-#: eeschema/edit_component_in_lib.cpp:1191
+#: eeschema/edit_component_in_lib.cpp:169
+#: eeschema/edit_component_in_lib.cpp:803
 msgid "Footprint Filter"
 msgstr "Filtrage Modules"
 
-#: eeschema/edit_component_in_lib.cpp:293
+#: eeschema/edit_component_in_lib.cpp:181
 msgid "Footprints"
 msgstr "Modules"
 
-#: eeschema/edit_component_in_lib.cpp:407
+#: eeschema/edit_component_in_lib.cpp:295
 msgid "Show Pin Num"
 msgstr "Montre Numéro de Pin"
 
-#: eeschema/edit_component_in_lib.cpp:476
-msgid "Align left"
-msgstr "Alignement à gauche"
-
-#: eeschema/edit_component_in_lib.cpp:476
-#: eeschema/edit_component_in_lib.cpp:479
-msgid "Align center"
-msgstr "Alignement au centre"
-
-#: eeschema/edit_component_in_lib.cpp:476
-msgid "Align right"
-msgstr "Alignement à droite"
-
-#: eeschema/edit_component_in_lib.cpp:479
-msgid "Align bottom"
-msgstr "Alignement en bas"
-
-#: eeschema/edit_component_in_lib.cpp:479
-msgid "Align top"
-msgstr "Alignement au sommet"
-
-#: eeschema/edit_component_in_lib.cpp:486
-msgid "Fields"
-msgstr "Champs"
-
-#: eeschema/edit_component_in_lib.cpp:499
-msgid "Show Text"
-msgstr "Texte visible"
-
 #: eeschema/edit_component_in_lib.cpp:504
-msgid "Vertical"
-msgstr "Vertical"
-
-#: eeschema/edit_component_in_lib.cpp:510
-msgid "Field Name:"
-msgstr "Nom Champ"
-
-#: eeschema/edit_component_in_lib.cpp:520
-msgid "Field Text:"
-msgstr "Texte du Champ:"
-
-#: eeschema/edit_component_in_lib.cpp:526
-msgid "Pos"
-msgstr "Pos"
-
-#: eeschema/edit_component_in_lib.cpp:531
-msgid "Hor Justify"
-msgstr "Justifié horiz"
-
-#: eeschema/edit_component_in_lib.cpp:538
-msgid "Vert Justify"
-msgstr "Justifié Vert."
-
-#: eeschema/edit_component_in_lib.cpp:553
-msgid "Chip Name"
-msgstr "Nom en librairie"
-
-#: eeschema/edit_component_in_lib.cpp:556
-msgid "Field to edit"
-msgstr "Champ à éditer"
-
-#: eeschema/edit_component_in_lib.cpp:892
 msgid "Ok to Delete Alias LIST"
 msgstr "Ok pour effacer la LISTE des Alias"
 
-#: eeschema/edit_component_in_lib.cpp:917
+#: eeschema/edit_component_in_lib.cpp:529
 msgid "New alias:"
 msgstr "Noveau alias"
 
-#: eeschema/edit_component_in_lib.cpp:917
+#: eeschema/edit_component_in_lib.cpp:529
 msgid "Component Alias"
 msgstr "Alias de Composant"
 
-#: eeschema/edit_component_in_lib.cpp:925
+#: eeschema/edit_component_in_lib.cpp:537
 msgid "This is the Root Part"
 msgstr "Ceci est le composant racine"
 
-#: eeschema/edit_component_in_lib.cpp:934
-#: eeschema/edit_component_in_lib.cpp:1202
+#: eeschema/edit_component_in_lib.cpp:546
+#: eeschema/edit_component_in_lib.cpp:814
 msgid "Already in use"
 msgstr "Déja en usage"
 
-#: eeschema/edit_component_in_lib.cpp:959
+#: eeschema/edit_component_in_lib.cpp:571
 msgid " is Current Selected Alias!"
 msgstr " est l' Alias actuellement sélectionné!"
 
-#: eeschema/edit_component_in_lib.cpp:1012
+#: eeschema/edit_component_in_lib.cpp:624
 msgid "Delete units"
 msgstr "Supprimer  unité"
 
-#: eeschema/edit_component_in_lib.cpp:1082
+#: eeschema/edit_component_in_lib.cpp:694
 msgid "Create pins for Convert items"
 msgstr "Créér les pins des unitées converties"
 
-#: eeschema/edit_component_in_lib.cpp:1086
+#: eeschema/edit_component_in_lib.cpp:698
 msgid "Part as \"De Morgan\" anymore"
 msgstr "Le composant a une représentation convertie"
 
-#: eeschema/edit_component_in_lib.cpp:1111
+#: eeschema/edit_component_in_lib.cpp:723
 msgid "Delete Convert items"
 msgstr "Suppression des éléments convertis"
 
-#: eeschema/edit_component_in_lib.cpp:1146
+#: eeschema/edit_component_in_lib.cpp:758
 msgid "Doc Files"
 msgstr "Fichiers de Doc"
 
-#: eeschema/edit_component_in_lib.cpp:1169
+#: eeschema/edit_component_in_lib.cpp:781
 msgid "Ok to Delete FootprintFilter LIST"
 msgstr "Ok pour effacer la LISTE des filtres de modules"
 
-#: eeschema/edit_component_in_lib.cpp:1191
+#: eeschema/edit_component_in_lib.cpp:803
 msgid "New FootprintFilter:"
 msgstr "Nouveau Filtre de Modules:"
 
@@ -7997,6 +7963,11 @@ msgstr "Miroir |"
 msgid "Pick the graphical transformation to be used when displaying the component, if any"
 msgstr "Ajuster la transformation graphique à utiliser pour afficher le composant"
 
+#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:63
+#: eeschema/dialog_edit_libentry_fields_in_lib.cpp:429
+msgid "Chip Name"
+msgstr "Nom en librairie"
+
 #: eeschema/dialog_edit_component_in_schematic_fbp.cpp:67
 msgid "The name of the symbol in the library from which this component came"
 msgstr "Le nom du symbole dans la librairie d'où vient le composant."
@@ -8009,6 +7980,10 @@ msgstr ""
 "Utiliser la représentation alternative pour ce composant\n"
 "Pour les portes, ceci est la conversion \"De Morgan\""
 
+#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:86
+msgid "Fields"
+msgstr "Champs"
+
 #: eeschema/dialog_edit_component_in_schematic_fbp.cpp:95
 msgid "Add a new custom field"
 msgstr "Ajouter un nouveau champ utilisateur"
@@ -8082,37 +8057,23 @@ msgstr "La position Y du texte relativement au composant"
 msgid "Reset to Library Defaults"
 msgstr "Remettre aux Valeurs par Défaut en Librairie"
 
-#: eeschema/dialog_edit_component_in_lib.cpp:139
-msgid "General :"
-msgstr "Général :"
+#: eeschema/dialog_edit_libentry_fields_in_lib.cpp:157
+#: eeschema/dialog_edit_libentry_fields_in_lib.cpp:162
+#: eeschema/dialog_edit_component_in_schematic.cpp:72
+#: eeschema/dialog_edit_component_in_schematic.cpp:77
+msgid "Pos "
+msgstr "Pos "
 
-#: eeschema/dialog_edit_component_in_lib.cpp:147
-msgid "Number of units:"
-msgstr "Nombre de Parts:"
-
-#: eeschema/dialog_edit_component_in_lib.cpp:175
-msgid "Doc:"
-msgstr "Doc:"
-
-#: eeschema/dialog_edit_component_in_lib.cpp:182
-msgid "Keywords:"
-msgstr "Mots Cles:"
-
-#: eeschema/dialog_edit_component_in_lib.cpp:189
-msgid "DocFileName:"
-msgstr "Fichier de Doc:"
-
-#: eeschema/dialog_edit_component_in_lib.cpp:198
-msgid "Copy Doc"
-msgstr "Copie Doc"
-
-#: eeschema/dialog_edit_component_in_lib.cpp:202
-msgid "Browse DocFiles"
-msgstr "Examen Fichiers de Doc"
-
-#: eeschema/component_class.cpp:131
-msgid "Datasheet"
-msgstr "Documentation"
+#: eeschema/dialog_edit_libentry_fields_in_lib.cpp:226
+#, c-format
+msgid ""
+"A new name is entered for this component\n"
+"An alias %s already exists!\n"
+"Cannot update this component"
+msgstr ""
+"Un noveau nom a été entré pour ce composant\n"
+"Un alias %s existe déjà!\n"
+"Ne peut mettre à jour ce composant"
 
 #: eeschema/libedit_onrightclick.cpp:77
 msgid "Move Arc "
@@ -8314,16 +8275,11 @@ msgstr "Valeur Composant"
 msgid "Component footprint"
 msgstr "Module du Composant"
 
-#: eeschema/dialog_edit_component_in_schematic.cpp:71
-#: eeschema/dialog_edit_component_in_schematic.cpp:76
-msgid "Pos "
-msgstr "Pos "
-
-#: eeschema/dialog_edit_component_in_schematic.cpp:123
+#: eeschema/dialog_edit_component_in_schematic.cpp:142
 msgid "No Component Name!"
 msgstr "Pas de nom de composant!"
 
-#: eeschema/dialog_edit_component_in_schematic.cpp:130
+#: eeschema/dialog_edit_component_in_schematic.cpp:149
 #, c-format
 msgid "Component [%s] not found!"
 msgstr "Composant [%s] non trouvé!"
@@ -8373,6 +8329,10 @@ msgstr "Chargement terminé"
 msgid " Text Options : "
 msgstr "Options du Texte: "
 
+#: eeschema/dialog_bodygraphictext_properties_base.cpp:42
+msgid "Vertical"
+msgstr "Vertical"
+
 #: eeschema/dialog_bodygraphictext_properties_base.cpp:53
 msgid "Size:"
 msgstr "Taille:"
@@ -8381,6 +8341,39 @@ msgstr "Taille:"
 msgid "Text Shape:"
 msgstr "Aspect Texte:"
 
+#: eeschema/dialog_edit_libentry_fields_in_lib_base.cpp:54
+msgid "Align left"
+msgstr "Alignement à gauche"
+
+#: eeschema/dialog_edit_libentry_fields_in_lib_base.cpp:54
+#: eeschema/dialog_edit_libentry_fields_in_lib_base.cpp:67
+msgid "Align center"
+msgstr "Alignement au centre"
+
+#: eeschema/dialog_edit_libentry_fields_in_lib_base.cpp:54
+msgid "Align right"
+msgstr "Alignement à droite"
+
+#: eeschema/dialog_edit_libentry_fields_in_lib_base.cpp:56
+msgid "Horiz. Justify"
+msgstr "Justification Horiz."
+
+#: eeschema/dialog_edit_libentry_fields_in_lib_base.cpp:67
+msgid "Align bottom"
+msgstr "Alignement en bas"
+
+#: eeschema/dialog_edit_libentry_fields_in_lib_base.cpp:67
+msgid "Align top"
+msgstr "Alignement au sommet"
+
+#: eeschema/dialog_edit_libentry_fields_in_lib_base.cpp:69
+msgid "Vert Justify"
+msgstr "Justifié Vert."
+
+#: eeschema/class_libentry_fields.cpp:128
+msgid "Datasheet"
+msgstr "Documentation"
+
 #: eeschema/eelibs_read_libraryfiles.cpp:117
 msgid "Start loading schematic libs"
 msgstr "Demarre chargement des librairies schématiques"
@@ -8600,6 +8593,7 @@ msgid "Delete selections"
 msgstr "Effacement des associations existantes"
 
 #: cvpcb/cvframe.cpp:376
+#: cvpcb/init.cpp:112
 #, c-format
 msgid "Componants: %d (free: %d)"
 msgstr "Composants: %d (libres: %d)"
@@ -8694,7 +8688,6 @@ msgid "1:1 zoom"
 msgstr "1:1 zoom"
 
 #: cvpcb/genorcad.cpp:134
-#: cvpcb/writenetlistpcbnew.cpp:168
 #, c-format
 msgid "%s %s pin %s : Different Nets"
 msgstr "%s %s pin %s :  Nets Differents"
@@ -9527,15 +9520,6 @@ msgstr "Effacement Bloc (ctrl + drag mouse)"
 msgid "Delete Dcode items"
 msgstr "Suppression d'éléments par DCode"
 
-#: gerbview/rs274x.cpp:297
-#, c-format
-msgid "Command <%c%c> ignored by Gerbview"
-msgstr "Commande <%c%c> ignorée par Gerbview"
-
-#: gerbview/rs274x.cpp:342
-msgid "Too many include files!!"
-msgstr "Trop de fichiers inclus!!"
-
 #: gerbview/edit.cpp:246
 msgid "No layer selected"
 msgstr "Pas de couche sélectionnée"
@@ -9600,13 +9584,21 @@ msgstr "N'affiche pas les couches Gerber"
 msgid "Save config file"
 msgstr "Sauver config"
 
+#: gerbview/rs274x.cpp:297
+#, c-format
+msgid "Command <%c%c> ignored by Gerbview"
+msgstr "Commande <%c%c> ignorée par Gerbview"
+
+#: gerbview/rs274x.cpp:332
+msgid "Too many include files!!"
+msgstr "Trop de fichiers inclus!!"
+
 #: gerbview/readgerb.cpp:253
 #, c-format
 msgid "%d errors while reading Gerber file [%s]"
 msgstr "%d erreurs pendant lecture fichier gerber [%s]"
 
 #: gerbview/readgerb.cpp:273
-#: gerbview/files.cpp:187
 msgid "D codes files:"
 msgstr "Fichiers D-Codes:"
 
@@ -9668,74 +9660,6 @@ msgstr "Infos:"
 msgid "Colors"
 msgstr "Couleurs"
 
-#: common/edaappl.cpp:56
-msgid "Default"
-msgstr "Defaut"
-
-#: common/edaappl.cpp:69
-msgid "French"
-msgstr "French"
-
-#: common/edaappl.cpp:75
-msgid "Spanish"
-msgstr "Espagnol"
-
-#: common/edaappl.cpp:81
-msgid "Portuguese"
-msgstr "Portugais"
-
-#: common/edaappl.cpp:87
-msgid "Italian"
-msgstr "Italien"
-
-#: common/edaappl.cpp:93
-msgid "German"
-msgstr "Allemand"
-
-#: common/edaappl.cpp:99
-msgid "Slovenian"
-msgstr "Slovène"
-
-#: common/edaappl.cpp:105
-msgid "Hungarian"
-msgstr "Hongrois"
-
-#: common/edaappl.cpp:111
-msgid "Polish"
-msgstr "Polonais"
-
-#: common/edaappl.cpp:117
-msgid "Czech"
-msgstr "Tchèque"
-
-#: common/edaappl.cpp:123
-msgid "Russian"
-msgstr "Russe"
-
-#: common/edaappl.cpp:129
-msgid "Korean"
-msgstr "Coréen"
-
-#: common/edaappl.cpp:135
-msgid "Chinese simplified"
-msgstr "Chinois Simplifié"
-
-#: common/edaappl.cpp:141
-msgid "Catalan"
-msgstr "Catalan"
-
-#: common/edaappl.cpp:147
-msgid "Dutch"
-msgstr "Hollandais"
-
-#: common/edaappl.cpp:612
-msgid "Language"
-msgstr "Langage"
-
-#: common/edaappl.cpp:613
-msgid "Select application language (only for testing!)"
-msgstr "Choisir le langage (seulement pour tests!)"
-
 #: common/zoom.cpp:238
 msgid "Center"
 msgstr "Centrer"
@@ -9961,6 +9885,74 @@ msgstr "Fichiers de Doc "
 msgid "Unknown MIME type for doc file <%s>"
 msgstr "MIME type inconnu pour fichier Doc <%s>"
 
+#: common/edaappl.cpp:80
+msgid "Default"
+msgstr "Defaut"
+
+#: common/edaappl.cpp:97
+msgid "French"
+msgstr "French"
+
+#: common/edaappl.cpp:105
+msgid "Spanish"
+msgstr "Espagnol"
+
+#: common/edaappl.cpp:113
+msgid "Portuguese"
+msgstr "Portugais"
+
+#: common/edaappl.cpp:121
+msgid "Italian"
+msgstr "Italien"
+
+#: common/edaappl.cpp:129
+msgid "German"
+msgstr "Allemand"
+
+#: common/edaappl.cpp:137
+msgid "Slovenian"
+msgstr "Slovène"
+
+#: common/edaappl.cpp:145
+msgid "Hungarian"
+msgstr "Hongrois"
+
+#: common/edaappl.cpp:153
+msgid "Polish"
+msgstr "Polonais"
+
+#: common/edaappl.cpp:161
+msgid "Czech"
+msgstr "Tchèque"
+
+#: common/edaappl.cpp:169
+msgid "Russian"
+msgstr "Russe"
+
+#: common/edaappl.cpp:177
+msgid "Korean"
+msgstr "Coréen"
+
+#: common/edaappl.cpp:185
+msgid "Chinese simplified"
+msgstr "Chinois Simplifié"
+
+#: common/edaappl.cpp:193
+msgid "Catalan"
+msgstr "Catalan"
+
+#: common/edaappl.cpp:201
+msgid "Dutch"
+msgstr "Hollandais"
+
+#: common/edaappl.cpp:747
+msgid "Language"
+msgstr "Langage"
+
+#: common/edaappl.cpp:748
+msgid "Select application language (only for testing!)"
+msgstr "Choisir le langage (seulement pour tests!)"
+
 #: common/base_screen.cpp:264
 #, c-format
 msgid "Grid size( %d, %d ) not in grid list, falling back to grid size( %d, %d )."
@@ -10744,6 +10736,10 @@ msgstr "EESchema Tracé PS"
 msgid "Graphic text properties:"
 msgstr "Propriétés du texte graphique:"
 
+#: eeschema/dialog_edit_libentry_fields_in_lib_base.h:74
+msgid "Fields Properties"
+msgstr "Propriétés des Champs"
+
 #: eeschema/component_wizard/dialog_component_setup.h:55
 msgid "Component Builder"
 msgstr "Générateur de Composant"
@@ -10912,6 +10908,16 @@ msgstr "Imprimer"
 msgid "Create SVG file"
 msgstr "Créer Fichier SVG"
 
+#~ msgid "Show Text"
+#~ msgstr "Texte visible"
+#~ msgid "Field Name:"
+#~ msgstr "Nom Champ"
+#~ msgid "Field Text:"
+#~ msgstr "Texte du Champ:"
+#~ msgid "Pos"
+#~ msgstr "Pos"
+#~ msgid "Field to edit"
+#~ msgstr "Champ à éditer"
 #~ msgid " Text : "
 #~ msgstr " Texte : "
 #~ msgid "Component name:"