diff --git a/3d-viewer/3d_toolbar.cpp b/3d-viewer/3d_toolbar.cpp
index 8dd575f49e..8dab08b2fd 100644
--- a/3d-viewer/3d_toolbar.cpp
+++ b/3d-viewer/3d_toolbar.cpp
@@ -45,10 +45,10 @@ void WinEDA3D_DrawFrame::ReCreateHToolbar()
     m_HToolBar->AddTool( ID_ZOOM_OUT_BUTT, wxEmptyString, BITMAP( zoom_out_xpm ),
                         _( "zoom - (F2)" ) );
 
-    m_HToolBar->AddTool( ID_ZOOM_REDRAW_BUTT, wxEmptyString, BITMAP( repaint_xpm ),
+    m_HToolBar->AddTool( ID_ZOOM_REDRAW_BUTT, wxEmptyString, BITMAP( zoom_redraw_xpm ),
                         _( "redraw (F3)" ) );
 
-    m_HToolBar->AddTool( ID_ZOOM_PAGE_BUTT, wxEmptyString, BITMAP( zoom_optimal_xpm ),
+    m_HToolBar->AddTool( ID_ZOOM_PAGE_BUTT, wxEmptyString, BITMAP( zoom_auto_xpm ),
                         _( "auto zoom" ) );
 
     m_HToolBar->AddSeparator();
diff --git a/bitmaps/Repaint.xpm b/bitmaps/Repaint.xpm
deleted file mode 100644
index bcefa410cc..0000000000
--- a/bitmaps/Repaint.xpm
+++ /dev/null
@@ -1,102 +0,0 @@
-/* XPM */
-#ifndef XPMMAIN
-extern const char * repaint_xpm[];
-
-#else
-const char * repaint_xpm[] = {
-"16 16 78 1",
-" 	c None",
-".	c #000000",
-"+	c #817858",
-"@	c #D6D0BD",
-"#	c #413C27",
-"$	c #E7D8A6",
-"%	c #F2EDD9",
-"&	c #877B52",
-"*	c #E9DBAE",
-"=	c #F1EBD6",
-"-	c #918458",
-";	c #DACD9F",
-">	c #F4EED9",
-",	c #6B6040",
-"'	c #EDE4C6",
-")	c #0C0B07",
-"!	c #A29771",
-"~	c #9A8F6A",
-"{	c #ADA281",
-"]	c #D5CCAF",
-"^	c #7F7862",
-"/	c #A39B7B",
-"(	c #7B6F4A",
-"_	c #CCBC85",
-":	c #E2CF8B",
-"<	c #BCAC75",
-"[	c #CEBD82",
-"}	c #C1B178",
-"|	c #5B5438",
-"1	c #A39878",
-"2	c #918C74",
-"3	c #8B8468",
-"4	c #8B8365",
-"5	c #91896C",
-"6	c #90886A",
-"7	c #6A634C",
-"8	c #D1C7A8",
-"9	c #E8E7E3",
-"0	c #D3D2CE",
-"a	c #B9B8B5",
-"b	c #948E78",
-"c	c #51504F",
-"d	c #161616",
-"e	c #101010",
-"f	c #121211",
-"g	c #0E0D0B",
-"h	c #555555",
-"i	c #050505",
-"j	c #040404",
-"k	c #6B372D",
-"l	c #6D392E",
-"m	c #974E3F",
-"n	c #44231C",
-"o	c #2F2F2F",
-"p	c #272727",
-"q	c #9D5546",
-"r	c #6C392E",
-"s	c #9C5344",
-"t	c #964E3F",
-"u	c #6C382D",
-"v	c #542B22",
-"w	c #9F5647",
-"x	c #A75E4F",
-"y	c #AD5C4B",
-"z	c #A55C4D",
-"A	c #2F1813",
-"B	c #B35D4B",
-"C	c #7E4134",
-"D	c #8D493B",
-"E	c #582D24",
-"F	c #6C372D",
-"G	c #613228",
-"H	c #64332A",
-"I	c #623228",
-"J	c #65342A",
-"K	c #502921",
-"L	c #4C271F",
-"M	c #3C1E18",
-"        ..      ",
-"       .+@#.    ",
-"       .$%&.    ",
-"       .*=-.    ",
-"       .;>,.    ",
-"      ...')..   ",
-"     .!~{]^/(.  ",
-"    ._::::<[}|. ",
-"    .123444567. ",
-"    .890a9a9ab. ",
-"    .cdedddfdg. ",
-"    .hij.k.jlm. ",
-"    nholpqrstu. ",
-"    vwxyxzxzxA  ",
-"BCDEFGHIJIKLM   ",
-"                "};
-#endif
diff --git a/bitmaps/Zoom_In.xpm b/bitmaps/Zoom_In.xpm
deleted file mode 100644
index 76c51320fb..0000000000
--- a/bitmaps/Zoom_In.xpm
+++ /dev/null
@@ -1,66 +0,0 @@
-/* XPM */
-#ifndef XPMMAIN
-extern const char * zoom_in_xpm[];
-
-#else
-const char * zoom_in_xpm[] = {
-"16 16 42 1",
-" 	c None",
-".	c #000000",
-"+	c #262626",
-"@	c #C5C5C5",
-"#	c #EEEEEE",
-"$	c #EDEDED",
-"%	c #ABABAB",
-"&	c #464646",
-"*	c #878787",
-"=	c #F1F1F1",
-"-	c #FEFEFE",
-";	c #FDFDFD",
-">	c #FCFCFC",
-",	c #EAEAEA",
-"'	c #707070",
-")	c #252525",
-"!	c #282828",
-"~	c #FBFBFB",
-"{	c #E8E8E8",
-"]	c #B0B0B0",
-"^	c #FFFFFF",
-"/	c #050505",
-"(	c #040404",
-"_	c #FAFAFA",
-":	c #A4A4A4",
-"<	c #090909",
-"[	c #242424",
-"}	c #E5E5E5",
-"|	c #E4E4E4",
-"1	c #F9F9F9",
-"2	c #BABABA",
-"3	c #E7E7E7",
-"4	c #858585",
-"5	c #E3E3E3",
-"6	c #6D6D6D",
-"7	c #A1A1A1",
-"8	c #202020",
-"9	c #686868",
-"0	c #343434",
-"a	c #797979",
-"b	c #3A3A3A",
-"c	c #1F1F1F",
-"    ....        ",
-"  .+@#$%&.      ",
-" .*=--;>,'.     ",
-" &=--)!;~{&     ",
-".]--^/(;>_:.    ",
-".#-//<(([_}.    ",
-".$;[(../[_|.    ",
-".%>;;((~_12.    ",
-" &,~><)_13&     ",
-" .4{___156.     ",
-"  .&:}|7&....   ",
-"    ....  88..  ",
-"          .90.. ",
-"           .ab..",
-"            .9c.",
-"             .. "};
-#endif
diff --git a/bitmaps/Zoom_Optimal.xpm b/bitmaps/Zoom_Optimal.xpm
deleted file mode 100644
index 98dbd81204..0000000000
--- a/bitmaps/Zoom_Optimal.xpm
+++ /dev/null
@@ -1,107 +0,0 @@
-/* XPM */
-#ifndef XPMMAIN
-extern const char * zoom_optimal_xpm[];
-
-#else
-const char * zoom_optimal_xpm[] = {
-"16 16 83 1",
-" 	c None",
-".	c #000000",
-"+	c #262626",
-"@	c #C5C5C5",
-"#	c #EEEEEE",
-"$	c #EDEDED",
-"%	c #ABABAB",
-"&	c #464646",
-"*	c #878787",
-"=	c #F1F1F1",
-"-	c #FEFEFE",
-";	c #FDFDFD",
-">	c #FCFCFC",
-",	c #EAEAEA",
-"'	c #707070",
-")	c #FBFBFB",
-"!	c #E8E8E8",
-"~	c #565656",
-"{	c #7C7C7C",
-"]	c #7D7D7D",
-"^	c #FAFAFA",
-"/	c #A4A4A4",
-"(	c #747474",
-"_	c #F8F2DD",
-":	c #DEDEDE",
-"<	c #E5E5E5",
-"[	c #F7F1DC",
-"}	c #F5E9BD",
-"|	c #DDE0E4",
-"1	c #7B7B7B",
-"2	c #E4E4E4",
-"3	c #535353",
-"4	c #F6F0DB",
-"5	c #F4E8BC",
-"6	c #BCBCBC",
-"7	c #C0CCD8",
-"8	c #7A7A7A",
-"9	c #D5D5D5",
-"0	c #BABABA",
-"a	c #222222",
-"b	c #E5DFCB",
-"c	c #F2E6BB",
-"d	c #F3E7BB",
-"e	c #CDC5A7",
-"f	c #DEE3E7",
-"g	c #B5C2D1",
-"h	c #AAB5C2",
-"i	c #929292",
-"j	c #333333",
-"k	c #827F74",
-"l	c #E0D5AC",
-"m	c #F1E5BA",
-"n	c #AFAFAF",
-"o	c #C9D3DD",
-"p	c #B4C1D0",
-"q	c #A4B0BE",
-"r	c #353535",
-"s	c #181712",
-"t	c #505050",
-"u	c #CBCFD3",
-"v	c #A5B1BF",
-"w	c #747D87",
-"x	c #32363A",
-"y	c #F5E9BF",
-"z	c #817445",
-"A	c #17150C",
-"B	c #010100",
-"C	c #010102",
-"D	c #0B0E11",
-"E	c #191F26",
-"F	c #101010",
-"G	c #202020",
-"H	c #EED680",
-"I	c #6A6A6A",
-"J	c #9EB1C6",
-"K	c #7590AE",
-"L	c #686868",
-"M	c #343434",
-"N	c #C7D0D8",
-"O	c #617891",
-"P	c #797979",
-"Q	c #3A3A3A",
-"R	c #1F1F1F",
-"    ....        ",
-"  .+@#$%&.      ",
-" .*=--;>,'.     ",
-" &=----;)!&     ",
-".~{{]{{;>^/.    ",
-".(-___{{:^<.    ",
-".([}}}{|1^2.    ",
-".3455567890.    ",
-".abcdefghi&     ",
-" jklmnopqr.     ",
-" .satuvwx....   ",
-" .yzABCDE.FG..  ",
-" .yHHIJKK..LM.. ",
-" ....NKKKO..PQ..",
-"    ....... .LR.",
-"             .. "};
-#endif
diff --git a/bitmaps/Zoom_Out.xpm b/bitmaps/Zoom_Out.xpm
deleted file mode 100644
index 808be129e6..0000000000
--- a/bitmaps/Zoom_Out.xpm
+++ /dev/null
@@ -1,64 +0,0 @@
-/* XPM */
-#ifndef XPMMAIN
-extern const char * zoom_out_xpm[];
-
-#else
-const char * zoom_out_xpm[] = {
-"16 16 40 1",
-" 	c None",
-".	c #000000",
-"+	c #262626",
-"@	c #C5C5C5",
-"#	c #EEEEEE",
-"$	c #EDEDED",
-"%	c #ABABAB",
-"&	c #464646",
-"*	c #878787",
-"=	c #F1F1F1",
-"-	c #FEFEFE",
-";	c #FDFDFD",
-">	c #FCFCFC",
-",	c #EAEAEA",
-"'	c #707070",
-")	c #FBFBFB",
-"!	c #E8E8E8",
-"~	c #B0B0B0",
-"{	c #FFFFFF",
-"]	c #FAFAFA",
-"^	c #A4A4A4",
-"/	c #050505",
-"(	c #090909",
-"_	c #040404",
-":	c #242424",
-"<	c #E5E5E5",
-"[	c #E4E4E4",
-"}	c #F9F9F9",
-"|	c #BABABA",
-"1	c #E7E7E7",
-"2	c #858585",
-"3	c #E3E3E3",
-"4	c #6D6D6D",
-"5	c #A1A1A1",
-"6	c #202020",
-"7	c #686868",
-"8	c #343434",
-"9	c #797979",
-"0	c #3A3A3A",
-"a	c #1F1F1F",
-"    ....        ",
-"  .+@#$%&.      ",
-" .*=--;>,'.     ",
-" &=----;)!&     ",
-".~--{--;>]^.    ",
-".#-//(__:]<.    ",
-".$;:_../:][.    ",
-".%>;;;>)]}|.    ",
-" &,)>))]}1&     ",
-" .2!]]]}34.     ",
-"  .&^<[5&....   ",
-"    ....  66..  ",
-"          .78.. ",
-"           .90..",
-"            .7a.",
-"             .. "};
-#endif
diff --git a/bitmaps/makefile.include b/bitmaps/makefile.include
index b64b60f0b3..2eee172b80 100644
--- a/bitmaps/makefile.include
+++ b/bitmaps/makefile.include
@@ -225,7 +225,6 @@ OBJECTS = \
     red.o\
     reload2.o\
     reload.o\
-    Repaint.o\
     right.o\
     Rotate_Field.o\
     Rotate_Module-.o\
@@ -278,9 +277,10 @@ OBJECTS = \
     zip.o\
     Zoom_1.o\
     Zoom_Center.o\
-    Zoom_In.o\
-    Zoom_Optimal.o\
-    Zoom_Out.o\
+    zoom_in.o\
+    zoom_auto.o\
+    zoom_out.o\
+    zoom_redraw.o\
     Zoom_Page.o\
     Zoom_Selected.o\
     Zoom_Select.o\
diff --git a/bitmaps/redo.xpm b/bitmaps/redo.xpm
index c54d0963aa..2e684a08f1 100644
--- a/bitmaps/redo.xpm
+++ b/bitmaps/redo.xpm
@@ -1,31 +1,67 @@
 /* XPM */
-#ifndef XPMMAIN
-extern const char *redo_xpm[];
-
-#else
 const char *redo_xpm[] = {
-/* width height num_colors const chars_per_pixel */
-"16 16 4 1",
-/* colors */
-"  c None",
-"X c #0000E0",
-"a c #808080",
-". c #404040",
+/* columns rows colors chars-per-pixel */
+"16 16 45 1",
+"p c #78B83A",
+"  c none",
+"> c #B6F17D",
+"u c #4E8F0F",
+"w c #77D917",
+"3 c #BCF387",
+"* c #DFF8C5",
+"2 c #CFF6A8",
+"5 c #4D8D0F",
+". c #4E9A06",
+"% c #D4F7B1",
+"8 c #87E927",
+"1 c #D2F7AD",
+"y c #93EB3D",
+"4 c #CDEDAC",
+"a c #A7DE72",
+"$ c #EAFBD9",
+"g c #ABEF69",
+"j c #B7F17F",
+"q c #B5F17B",
+"9 c #6DC715",
+"< c #B1F173",
+"& c #BFF38D",
+"e c #9DDB60",
+"0 c #A4DC6F",
+"s c #C4F496",
+"h c #9BD860",
+": c #C2F492",
+"; c #D0F6AA",
+"t c #D7F7B7",
+", c #DEF8C3",
+"O c #DEF8C4",
+"- c #CEF6A6",
+"X c #E3F9CE",
+"i c #D3F7AF",
+"7 c #DAF8BC",
+"6 c #DFF9C5",
+"# c #E6FAD2",
+"@ c #EBFBDB",
+"f c #B3F076",
+"o c #E2FACA",
+"= c #E9FBD7",
+"+ c #A3EE5A",
+"r c #A4DB6F",
+"d c #63B513",
 /* pixels */
-"                ",
-"                ",
-"                ",
-"                ",
-"   aXXXX..      ",
-"  aX....XX.. X..",
-" XX     ..X XX..",
-" XX      ..XXX..",
-" XX     ..XXXX..",
-" XX    ..XXXXX..",
-" .aXX  .........",
-"  .XXXa         ",
-"                ",
-"                ",
-"                ",
-"                "};
-#endif
+"         .      ",
+"         ..     ",
+"         .X.    ",
+"     .....oO.   ",
+"    ..+@#$%&*.  ",
+"   ..%=-;:>>>,. ",
+"  ..<$123>>>>>4.",
+"  .56789999990..",
+"  .q6weeeee9r.. ",
+"  .tyeu...er..  ",
+"  .iep.  .a..   ",
+"  .se..  ...    ",
+"  .df.   ..     ",
+"  ..g..         ",
+"   .hj.         ",
+"   ....         "
+};
diff --git a/bitmaps/undo.xpm b/bitmaps/undo.xpm
index 6c68edef4a..83910d6194 100644
--- a/bitmaps/undo.xpm
+++ b/bitmaps/undo.xpm
@@ -1,31 +1,79 @@
 /* XPM */
-#ifndef XPMMAIN
-extern const char *undo_xpm[];
-
-#else
 const char *undo_xpm[] = {
-/* width height num_colors const chars_per_pixel */
-"16 16 4 1",
-/* colors */
-"  c None",
-"X c #0000E0",
-"a c #808080",
-". c #404040",
+/* columns rows colors chars-per-pixel */
+"16 16 57 1",
+"X c #FFF9C9",
+"  c none",
+"n c #988F00",
+"8 c #FFE611",
+"a c #F6EC9D",
+"+ c #7A9402",
+"= c #FFEC49",
+"w c #FFEC4B",
+"6 c #FFEC4D",
+"5 c #FFEF65",
+"# c #FFF281",
+": c #FFF287",
+"r c #FFF290",
+", c #FFF59D",
+"3 c #FFF59F",
+"0 c #9C8B00",
+"> c #FFF5A1",
+"4 c #FFF5A5",
+"s c #FFF5AB",
+"y c #FFF5AD",
+"g c #939000",
+"o c #FFF8BD",
+"@ c #FFF8BF",
+"% c #FFFBD5",
+"* c #FFFBD7",
+"u c #FDF5AF",
+"h c #BCA800",
+"q c #849201",
+"p c #9E8D00",
+"2 c #FFF17B",
+"v c #FFF181",
+"x c #EBDE7A",
+"1 c #FFF49B",
+"b c #C6B94C",
+"z c #FFF49F",
+"t c #FFF4A2",
+"d c #FFF7AF",
+"9 c #FFF7B5",
+"B c #799402",
+"& c #FFFACD",
+"< c #FFFAD3",
+"7 c #DCC500",
+"M c #FFEA39",
+"- c #819302",
+"e c #FFEA3D",
+". c #A08F00",
+"f c #FFED51",
+"c c #7F9302",
+"i c #FFF06D",
+"; c #FFF06F",
+"m c #FFF071",
+"k c #7D9302",
+"l c #FFF38B",
+"j c #FFF6A7",
+"N c #879201",
+"$ c #FFF6A9",
+"O c #FFF9C5",
 /* pixels */
-"                ",
-"                ",
-"                ",
-"                ",
-"      ..XXXXa   ",
-"..X ..XX....Xa  ",
-"..XX X..  ...XX ",
-"..XXX      ..XX ",
-"..XXXX     ..XX ",
-"..XXXXX    ..XX ",
-".......   ..XXa ",
-"        ..aXXX  ",
-"                ",
-"                ",
-"                ",
-"                "};
-#endif
+"      .         ",
+"     ..         ",
+"    .X.         ",
+"   .oO....+     ",
+"  .@#$%&*=.-    ",
+" .o;;;:>,<$.-   ",
+".1;;;;;234%5.+  ",
+"-.677777789@0q  ",
+" -.w7errtyu@i.  ",
+"  -.we...pasd.  ",
+"   -.f.  ghtj.  ",
+"    -..  k.yl.  ",
+"     -.   .zx.  ",
+"         c.vbn  ",
+"         .mM.   ",
+"         N..B   "
+};
diff --git a/bitmaps/zoom_auto.xpm b/bitmaps/zoom_auto.xpm
new file mode 100644
index 0000000000..cc6ba6f67a
--- /dev/null
+++ b/bitmaps/zoom_auto.xpm
@@ -0,0 +1,38 @@
+/* XPM */
+const char *zoom_auto_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 16 1",
+"@ c #A1BDDC",
+": c #74726C",
+"* c #739AC8",
+"% c #5D87BC",
+"= c #787A78",
+"; c #585955",
+"  c None",
+"& c #8EB0D2",
+"X c #8B918E",
+"O c #C0D2E1",
+"$ c #537EB4",
+"+ c #D9E0E7",
+"# c #85A6CD",
+"o c #B4BBBD",
+"- c #A0A29C",
+". c #898A86",
+/* pixels */
+"   ..X.....     ",
+"  X.oO+++o..    ",
+" .XO+@@@@O+X.   ",
+"..O#$%##%$#OX.  ",
+".o+$  &%  $Oo.  ",
+"XO@% %&&$ %@+.  ",
+"X+&#$&@@#**&+X  ",
+".+&***@@*$%&+.  ",
+"XO@$ $**$ $@OX  ",
+".o+$  $*  $+o.  ",
+".X+@$%##$%&+.=  ",
+" .X+++O+O++--;; ",
+"  .Xo++++o..oo;;",
+"   .XXXXXX:;=.o;",
+"           ;;=-;",
+"            ;;;;"
+};
diff --git a/bitmaps/zoom_in.xpm b/bitmaps/zoom_in.xpm
new file mode 100644
index 0000000000..1fa2094407
--- /dev/null
+++ b/bitmaps/zoom_in.xpm
@@ -0,0 +1,38 @@
+/* XPM */
+const char *zoom_in_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 16 1",
+"; c #9A9E98",
+"# c #A0BEDD",
+"% c #5883B7",
+"X c #AFB8BD",
+"@ c #D2DDE4",
+": c #585955",
+"  c None",
+". c #898B87",
+"* c #4C7AB4",
+"& c #8DB1D7",
+"- c #767672",
+"= c #BCC0BE",
+"$ c #B3CBE1",
+"+ c #909490",
+"o c #C5D5E2",
+"O c #E5E7EC",
+/* pixels */
+"   ........     ",
+"  ..XoOOoX..    ",
+" .+o@####@o+.   ",
+"..o$#$%%$#$o..  ",
+".X@#o%  %$&@X.  ",
+".o#$%%  %%#&o.  ",
+".O&%      *&O.  ",
+".O&*      *&O.  ",
+".@#&**  **&#@.  ",
+".X@&#%  *##@=.  ",
+"..@@##%%$#o@.-  ",
+" .;@Oooo@O@;;:: ",
+"  ..=OOO@=..==::",
+"   ..+..+.-:-.X:",
+"           ::-;:",
+"            ::::"
+};
diff --git a/bitmaps/zoom_out.xpm b/bitmaps/zoom_out.xpm
new file mode 100644
index 0000000000..7ad4297591
--- /dev/null
+++ b/bitmaps/zoom_out.xpm
@@ -0,0 +1,38 @@
+/* XPM */
+const char *zoom_out_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 16 1",
+"# c #9FBDDD",
+"- c #9A9E98",
+"X c #AFB8BD",
+"@ c #D2DDE4",
+"$ c #B2CBE2",
+"; c #585955",
+"o c #C4D5E4",
+"  c None",
+". c #898B87",
+"* c #4C7AB4",
+"& c #5682B7",
+"% c #8DB1D7",
+"= c #767672",
+": c #BCC0BE",
+"+ c #909490",
+"O c #E5E7EC",
+/* pixels */
+"   ........     ",
+"  ..XoOOoX..    ",
+" .+o@####o@+.   ",
+"..o$#$$$$#$o..  ",
+".X@#o@oo$$%oX.  ",
+".o#$&&&&&&##o.  ",
+".O%&      *%O.  ",
+".O%*      *%O.  ",
+".@#%******%#@.  ",
+".X@#%######OX.  ",
+"..@@##$#$#o@.=  ",
+" .-@Oooo@O@--;; ",
+"  ..:OOO@:..::;;",
+"   ..+..+.=;=.X;",
+"           ;;=-;",
+"            ;;;;"
+};
diff --git a/bitmaps/zoom_redraw.xpm b/bitmaps/zoom_redraw.xpm
new file mode 100644
index 0000000000..68145cfb1e
--- /dev/null
+++ b/bitmaps/zoom_redraw.xpm
@@ -0,0 +1,38 @@
+/* XPM */
+const char *zoom_redraw_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 16 1",
+"$ c #7195C3",
+"X c #2E5893",
+": c #3E6BA4",
+"- c #ACC0DC",
+"O c #4774AE",
+"o c #3665A0",
+"@ c #597EAF",
+"  c None",
+"# c #2F5E9C",
+"= c #3C6AAC",
+"+ c #6287B4",
+". c #244B87",
+"; c #5482BC",
+"* c #A1B8D4",
+"% c #81A0C9",
+"& c #8EA9CE",
+/* pixels */
+"   ........   ..",
+"  ..XoO+@#.. ...",
+" ..#oO+$%&%X....",
+" .X#...#+&**@&..",
+" ..X#=...o&*--..",
+" ..$=o   ..&%-..",
+" .o%;o  ..@-*-..",
+" .      ..XXX#..",
+" .............. ",
+" .--*+..    %$..",
+" .-&&..   o=$O..",
+" .-*-%X.. o=OX. ",
+" .*+**%@X..X... ",
+" .o.X$%$@O###.. ",
+" .. ..X:O=##..  ",
+" ..  ........   "
+};
diff --git a/cvpcb/displayframe.cpp b/cvpcb/displayframe.cpp
index 98a5ff47b4..4d6d7c0952 100644
--- a/cvpcb/displayframe.cpp
+++ b/cvpcb/displayframe.cpp
@@ -125,10 +125,10 @@ void WinEDA_DisplayFrame::ReCreateHToolbar()
     m_HToolBar->AddTool( ID_ZOOM_OUT_BUTT, wxEmptyString, BITMAP( zoom_out_xpm ),
                         _( "zoom - (F2)" ) );
 
-    m_HToolBar->AddTool( ID_ZOOM_REDRAW_BUTT, wxEmptyString, BITMAP( repaint_xpm ),
+    m_HToolBar->AddTool( ID_ZOOM_REDRAW_BUTT, wxEmptyString, BITMAP( zoom_redraw_xpm ),
                         _( "redraw (F3)" ) );
 
-    m_HToolBar->AddTool( ID_ZOOM_PAGE_BUTT, wxEmptyString, BITMAP( zoom_optimal_xpm ),
+    m_HToolBar->AddTool( ID_ZOOM_PAGE_BUTT, wxEmptyString, BITMAP( zoom_auto_xpm ),
                         _( "1:1 zoom" ) );
 
     m_HToolBar->AddSeparator();
diff --git a/eeschema/menubar.cpp b/eeschema/menubar.cpp
index 0b5b4e5d20..5ec232f72e 100644
--- a/eeschema/menubar.cpp
+++ b/eeschema/menubar.cpp
@@ -185,7 +185,7 @@ void WinEDA_SchematicFrame::ReCreateMenuBar()
         item = new wxMenuItem( viewMenu, ID_ZOOM_PAGE_BUTT,
                                _( "Zoom auto" ), _( "Zoom auto" ),
                                wxITEM_NORMAL );
-        item->SetBitmap( zoom_optimal_xpm );
+        item->SetBitmap( zoom_auto_xpm );
         viewMenu->Append( item );
 
         viewMenu->AppendSeparator();
@@ -195,7 +195,7 @@ void WinEDA_SchematicFrame::ReCreateMenuBar()
         item = new wxMenuItem( viewMenu, ID_ZOOM_REDRAW_BUTT,
                                msg, _( "Zoom auto" ),
                                wxITEM_NORMAL );
-        item->SetBitmap( repaint_xpm );
+        item->SetBitmap( zoom_redraw_xpm );
         viewMenu->Append( item );
 
         // Place Menu
diff --git a/eeschema/tool_lib.cpp b/eeschema/tool_lib.cpp
index c816289e20..e83f78374b 100644
--- a/eeschema/tool_lib.cpp
+++ b/eeschema/tool_lib.cpp
@@ -173,11 +173,11 @@ void WinEDA_LibeditFrame::ReCreateHToolbar()
                              msg );
 
         msg = AddHotkeyName( _( "redraw" ), s_Libedit_Hokeys_Descr, HK_ZOOM_REDRAW );
-        m_HToolBar->AddTool( ID_ZOOM_REDRAW_BUTT, wxEmptyString, BITMAP( repaint_xpm ),
+        m_HToolBar->AddTool( ID_ZOOM_REDRAW_BUTT, wxEmptyString, BITMAP( zoom_redraw_xpm ),
                              msg );
 
         m_HToolBar->AddTool( ID_ZOOM_PAGE_BUTT, wxEmptyString,
-                            BITMAP( zoom_optimal_xpm ),
+                            BITMAP( zoom_auto_xpm ),
                             _( "auto zoom" ) );
 
         m_HToolBar->AddSeparator();
diff --git a/eeschema/tool_sch.cpp b/eeschema/tool_sch.cpp
index 72bfa3d36c..b8f021a3fd 100644
--- a/eeschema/tool_sch.cpp
+++ b/eeschema/tool_sch.cpp
@@ -98,10 +98,10 @@ void WinEDA_SchematicFrame::ReCreateHToolbar()
                          msg );
 
     msg = AddHotkeyName( _( "redraw" ), s_Schematic_Hokeys_Descr, HK_ZOOM_REDRAW );
-    m_HToolBar->AddTool( ID_ZOOM_REDRAW_BUTT, wxEmptyString, BITMAP( repaint_xpm ),
+    m_HToolBar->AddTool( ID_ZOOM_REDRAW_BUTT, wxEmptyString, BITMAP( zoom_redraw_xpm ),
                          msg );
 
-    m_HToolBar->AddTool( ID_ZOOM_PAGE_BUTT, wxEmptyString, BITMAP( zoom_optimal_xpm ),
+    m_HToolBar->AddTool( ID_ZOOM_PAGE_BUTT, wxEmptyString, BITMAP( zoom_auto_xpm ),
                         _( "auto zoom" ) );
 
     m_HToolBar->AddSeparator();
diff --git a/eeschema/tool_viewlib.cpp b/eeschema/tool_viewlib.cpp
index ce0f74fd2c..2213f782df 100644
--- a/eeschema/tool_viewlib.cpp
+++ b/eeschema/tool_viewlib.cpp
@@ -71,12 +71,12 @@ bool asdeMorgan = FALSE, state;
 					_("zoom - (F2)"));
 
 		m_HToolBar->AddTool(ID_ZOOM_REDRAW_BUTT, wxEmptyString,
-					BITMAP(repaint_xpm),
+					BITMAP(zoom_redraw_xpm),
 					_("redraw (F3)"));
 
 		m_HToolBar->AddTool(ID_ZOOM_PAGE_BUTT, wxEmptyString,
-					BITMAP(zoom_optimal_xpm),
-					_("1:1 zoom"));
+					BITMAP(zoom_auto_xpm),
+					_("best zoom"));
 
 		m_HToolBar->AddSeparator();
 		m_HToolBar->AddTool(ID_LIBVIEW_DE_MORGAN_NORMAL_BUTT, wxEmptyString,
diff --git a/gerbview/tool_gerber.cpp b/gerbview/tool_gerber.cpp
index f3591e1907..c87d824b6b 100644
--- a/gerbview/tool_gerber.cpp
+++ b/gerbview/tool_gerber.cpp
@@ -283,13 +283,13 @@ void WinEDA_GerberFrame::ReCreateHToolbar( void )
                          msg );
 
     msg = AddHotkeyName( _( "redraw" ), s_Gerbview_Hokeys_Descr, HK_ZOOM_REDRAW );
-    m_HToolBar->AddTool( ID_ZOOM_REDRAW_BUTT, BITMAP( repaint_xpm ),
+    m_HToolBar->AddTool( ID_ZOOM_REDRAW_BUTT, BITMAP( zoom_redraw_xpm ),
                          wxNullBitmap,
                          FALSE,
                          -1, -1, (wxObject*) NULL,
                          msg );
 
-    m_HToolBar->AddTool( ID_ZOOM_PAGE_BUTT, BITMAP( zoom_optimal_xpm ),
+    m_HToolBar->AddTool( ID_ZOOM_PAGE_BUTT, BITMAP( zoom_auto_xpm ),
                         wxNullBitmap,
                         FALSE,
                         -1, -1, (wxObject*) NULL,
diff --git a/include/bitmaps.h b/include/bitmaps.h
index b05887c133..ad6852098c 100644
--- a/include/bitmaps.h
+++ b/include/bitmaps.h
@@ -364,9 +364,10 @@ extern const char* zip_tool_xpm[];
 extern const char* zip_xpm[];
 extern const char* zoom_1_xpm[];
 extern const char* zoom_center_xpm[];
-extern const char* zoom_in_xpm[];
 extern const char* zoomoins3d_xpm[];
-extern const char* zoom_optimal_xpm[];
+extern const char* zoom_redraw_xpm[];
+extern const char* zoom_auto_xpm[];
+extern const char* zoom_in_xpm[];
 extern const char* zoom_out_xpm[];
 extern const char* zoompage3d_xpm[];
 extern const char* zoom_page_xpm[];
diff --git a/internat/fr/kicad.mo b/internat/fr/kicad.mo
index f0409ba1ae..38d0945388 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 567f83944c..e1a41fcb2c 100644
--- a/internat/fr/kicad.po
+++ b/internat/fr/kicad.po
@@ -2,9 +2,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: kicad\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-25 08:23+0100\n"
-"PO-Revision-Date: 2008-08-25 13:11+0100\n"
-"Last-Translator: jp charras <jean-pierre.charras@inpg.fr>\n"
+"POT-Creation-Date: 2008-08-25 21:24+0100\n"
+"PO-Revision-Date: 2008-08-25 21:24+0100\n"
+"Last-Translator: \n"
 "Language-Team: kicad team <jean-pierre.charras@ujf-grenoble.fr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -36,13 +36,11 @@ msgstr "Net Code"
 
 #: pcbnew/affiche.cpp:53
 #: pcbnew/class_board.cpp:551
-#: pcbnew/class_module.cpp:1092
 msgid "Pads"
 msgstr "Pads"
 
 #: pcbnew/affiche.cpp:67
 #: pcbnew/class_board.cpp:561
-#: pcbnew/plotps.cpp:363
 msgid "Vias"
 msgstr "Vias"
 
@@ -51,7 +49,6 @@ msgid "Net Length"
 msgstr "Long. Net:"
 
 #: pcbnew/automove.cpp:207
-#: pcbnew/xchgmod.cpp:612
 msgid "No Modules!"
 msgstr "Pas de Modules"
 
@@ -149,60 +146,10 @@ msgid "Include egde layer"
 msgstr "Inclure couche Edge"
 
 #: pcbnew/block.cpp:154
-#: pcbnew/cotation.cpp:109
-#: pcbnew/dialog_edit_module.cpp:122
-#: pcbnew/dialog_orient_footprints.cpp:177
-#: pcbnew/globaleditpad.cpp:108
-#: pcbnew/mirepcb.cpp:103
-#: pcbnew/modedit_onclick.cpp:192
-#: pcbnew/modedit_onclick.cpp:224
-#: pcbnew/muonde.cpp:352
-#: pcbnew/pcbtexte.cpp:119
-#: pcbnew/sel_layer.cpp:163
-#: pcbnew/sel_layer.cpp:322
-#: pcbnew/set_color.cpp:357
-#: pcbnew/onrightclick.cpp:122
-#: pcbnew/onrightclick.cpp:136
-#: pcbnew/dialog_gendrill.cpp:297
-#: eeschema/eelayer.cpp:255
-#: eeschema/libedit_onrightclick.cpp:42
-#: eeschema/libedit_onrightclick.cpp:57
-#: eeschema/onrightclick.cpp:98
-#: eeschema/onrightclick.cpp:110
-#: eeschema/sheetlab.cpp:98
-#: gerbview/onrightclick.cpp:39
-#: gerbview/onrightclick.cpp:58
-#: gerbview/options.cpp:169
-#: gerbview/options.cpp:293
-#: gerbview/reglage.cpp:112
-#: gerbview/set_color.cpp:329
-#: common/displlst.cpp:111
-#: common/get_component_dialog.cpp:121
-#: common/selcolor.cpp:171
-#: share/svg_print.cpp:239
 msgid "Cancel"
 msgstr "Annuler"
 
 #: pcbnew/block.cpp:157
-#: pcbnew/cotation.cpp:105
-#: pcbnew/dialog_edit_module.cpp:118
-#: pcbnew/dialog_orient_footprints.cpp:174
-#: pcbnew/dialog_zones_by_polygon.cpp:204
-#: pcbnew/mirepcb.cpp:99
-#: pcbnew/muonde.cpp:348
-#: pcbnew/pcbtexte.cpp:114
-#: pcbnew/sel_layer.cpp:159
-#: pcbnew/sel_layer.cpp:318
-#: pcbnew/set_color.cpp:353
-#: pcbnew/dialog_gendrill.cpp:292
-#: eeschema/eelayer.cpp:251
-#: eeschema/sheetlab.cpp:94
-#: gerbview/options.cpp:165
-#: gerbview/options.cpp:289
-#: gerbview/reglage.cpp:108
-#: gerbview/set_color.cpp:325
-#: common/displlst.cpp:106
-#: common/get_component_dialog.cpp:112
 msgid "OK"
 msgstr "OK"
 
@@ -251,47 +198,30 @@ msgid "Connect"
 msgstr "Connect"
 
 #: pcbnew/class_board.cpp:576
-#: eeschema/eelayer.h:115
 msgid "NoConn"
 msgstr "Non Conn"
 
 #: pcbnew/class_board_item.cpp:23
-#: pcbnew/dialog_display_options.cpp:221
-#: pcbnew/dialog_display_options.cpp:229
-#: pcbnew/dialog_display_options.cpp:266
-#: pcbnew/dialog_zones_by_polygon.cpp:170
-#: pcbnew/pcbplot.cpp:415
-#: gerbview/options.cpp:321
 msgid "Line"
 msgstr "Ligne"
 
 #: pcbnew/class_board_item.cpp:24
-#: pcbnew/dialog_pad_edit.cpp:198
 msgid "Rect"
 msgstr "Rect"
 
 #: pcbnew/class_board_item.cpp:25
-#: pcbnew/class_drawsegment.cpp:311
 msgid "Arc"
 msgstr "Arc"
 
 #: pcbnew/class_board_item.cpp:26
-#: pcbnew/class_drawsegment.cpp:307
-#: pcbnew/class_track.cpp:879
-#: pcbnew/dialog_pad_edit.cpp:176
-#: pcbnew/dialog_pad_edit.cpp:196
 msgid "Circle"
 msgstr "Cercle"
 
 #: pcbnew/class_board_item.cpp:57
-#: pcbnew/class_pad.cpp:909
 msgid "Net"
 msgstr "Net"
 
 #: pcbnew/class_board_item.cpp:62
-#: eeschema/component_class.cpp:74
-#: eeschema/dialog_build_BOM.cpp:298
-#: eeschema/edit_component_in_schematic.cpp:835
 msgid "Footprint"
 msgstr "Module"
 
@@ -335,20 +265,10 @@ msgid "Pcb Text"
 msgstr "Texte Pcb"
 
 #: pcbnew/class_board_item.cpp:100
-#: pcbnew/dialog_netlist.cpp:162
-#: eeschema/dialog_create_component.cpp:167
-#: eeschema/edit_component_in_schematic.cpp:758
-#: eeschema/onrightclick.cpp:307
-#: eeschema/eelayer.h:152
 msgid "Reference"
 msgstr "Référence"
 
 #: pcbnew/class_board_item.cpp:104
-#: pcbnew/class_edge_mod.cpp:287
-#: pcbnew/class_text_mod.cpp:488
-#: eeschema/component_class.cpp:73
-#: eeschema/edit_component_in_schematic.cpp:796
-#: eeschema/eelayer.h:158
 msgid "Value"
 msgstr "Valeur"
 
@@ -359,8 +279,6 @@ msgid " of "
 msgstr " de "
 
 #: pcbnew/class_board_item.cpp:109
-#: pcbnew/class_text_mod.cpp:488
-#: pcbnew/class_text_mod.cpp:497
 msgid "Text"
 msgstr "Texte"
 
@@ -369,39 +287,31 @@ msgid "Graphic"
 msgstr "Graphique"
 
 #: pcbnew/class_board_item.cpp:127
-#: pcbnew/class_track.cpp:841
-#: pcbnew/pcbframe.cpp:467
 msgid "Track"
 msgstr "Piste"
 
 #: pcbnew/class_board_item.cpp:134
 #: pcbnew/class_board_item.cpp:201
-#: pcbnew/dialog_zones_by_polygon.cpp:231
 msgid "Net:"
 msgstr "Net:"
 
 #: pcbnew/class_board_item.cpp:139
-#: pcbnew/class_zone.cpp:601
 msgid "Zone Outline"
 msgstr "Contour de Zone"
 
 #: pcbnew/class_board_item.cpp:144
-#: pcbnew/class_zone.cpp:605
 msgid "(Cutout)"
 msgstr "(Cutout)"
 
 #: pcbnew/class_board_item.cpp:163
-#: pcbnew/class_zone.cpp:625
 msgid "Not Found"
 msgstr " Non Trouvé"
 
 #: pcbnew/class_board_item.cpp:169
-#: pcbnew/class_track.cpp:845
 msgid "Zone"
 msgstr "Zone"
 
 #: pcbnew/class_board_item.cpp:187
-#: pcbnew/pcbframe.cpp:499
 msgid "Via"
 msgstr "Via"
 
@@ -410,12 +320,10 @@ msgid "Blind/Buried"
 msgstr "Borgne/Aveugle"
 
 #: pcbnew/class_board_item.cpp:193
-#: pcbnew/pcbnew.h:292
 msgid "Micro Via"
 msgstr "Micro Via"
 
 #: pcbnew/class_board_item.cpp:216
-#: pcbnew/class_marker.cpp:133
 msgid "Marker"
 msgstr "Marqueur"
 
@@ -436,7 +344,6 @@ msgstr "dimension"
 #: pcbnew/class_text_mod.cpp:503
 #: pcbnew/class_track.cpp:852
 #: pcbnew/class_zone.cpp:608
-#: gerbview/affiche.cpp:94
 msgid "Type"
 msgstr "Type"
 
@@ -460,9 +367,6 @@ msgstr "Segment"
 #: pcbnew/class_text_mod.cpp:516
 #: pcbnew/class_track.cpp:909
 #: pcbnew/class_zone.cpp:637
-#: pcbnew/dialog_edit_module.cpp:235
-#: pcbnew/sel_layer.cpp:146
-#: gerbview/affiche.cpp:110
 msgid "Layer"
 msgstr "Couche"
 
@@ -471,19 +375,10 @@ msgstr "Couche"
 #: pcbnew/class_pcb_text.cpp:204
 #: pcbnew/class_text_mod.cpp:528
 #: pcbnew/class_track.cpp:932
-#: pcbnew/cotation.cpp:129
-#: pcbnew/dialog_edit_mod_text.cpp:254
-#: pcbnew/mirepcb.cpp:113
-#: pcbnew/pcbtexte.cpp:133
-#: eeschema/affiche.cpp:187
-#: eeschema/dialog_cmp_graphic_properties.cpp:189
-#: gerbview/affiche.cpp:52
-#: gerbview/affiche.cpp:114
 msgid "Width"
 msgstr "Epaisseur"
 
 #: pcbnew/class_drc_item.cpp:39
-#: pcbnew/dialog_drc.cpp:484
 msgid "Unconnected pads"
 msgstr "Pads non connectés"
 
@@ -551,7 +446,6 @@ msgstr "Seg"
 #: pcbnew/class_module.cpp:1107
 #: pcbnew/class_pad.cpp:903
 #: pcbnew/class_text_mod.cpp:494
-#: cvpcb/setvisu.cpp:31
 msgid "Module"
 msgstr "Module"
 
@@ -588,9 +482,6 @@ msgstr "Stat"
 #: pcbnew/class_pad.cpp:1035
 #: pcbnew/class_pcb_text.cpp:201
 #: pcbnew/class_text_mod.cpp:525
-#: pcbnew/dialog_edit_module.cpp:246
-#: eeschema/affiche.cpp:116
-#: gerbview/affiche.cpp:49
 msgid "Orient"
 msgstr "Orient"
 
@@ -617,14 +508,12 @@ msgstr "RefP"
 #: pcbnew/class_pad.cpp:1006
 #: pcbnew/class_pcb_text.cpp:207
 #: pcbnew/class_text_mod.cpp:531
-#: gerbview/affiche.cpp:55
 msgid "H Size"
 msgstr "Taille H"
 
 #: pcbnew/class_pad.cpp:1010
 #: pcbnew/class_pcb_text.cpp:210
 #: pcbnew/class_text_mod.cpp:534
-#: gerbview/affiche.cpp:58
 msgid "V Size"
 msgstr "Taille V"
 
@@ -647,38 +536,25 @@ msgid "Y pos"
 msgstr "Y pos"
 
 #: pcbnew/class_pcb_text.cpp:186
-#: gerbview/affiche.cpp:29
 msgid "COTATION"
 msgstr "COTATION"
 
 #: pcbnew/class_pcb_text.cpp:188
-#: gerbview/affiche.cpp:32
 msgid "PCB Text"
 msgstr "Texte Pcb"
 
 #: pcbnew/class_pcb_text.cpp:194
 #: pcbnew/class_text_mod.cpp:522
-#: pcbnew/cotation.cpp:113
-#: pcbnew/modedit_onclick.cpp:243
-#: pcbnew/pcbtexte.cpp:180
-#: gerbview/affiche.cpp:40
-#: share/dialog_print.cpp:198
 msgid "Mirror"
 msgstr "Miroir"
 
 #: pcbnew/class_pcb_text.cpp:196
 #: pcbnew/class_text_mod.cpp:506
-#: pcbnew/dialog_display_options.cpp:275
-#: eeschema/dialog_options.cpp:280
-#: gerbview/affiche.cpp:43
 msgid "No"
 msgstr "Non"
 
 #: pcbnew/class_pcb_text.cpp:198
 #: pcbnew/class_text_mod.cpp:508
-#: pcbnew/dialog_display_options.cpp:274
-#: eeschema/dialog_options.cpp:279
-#: gerbview/affiche.cpp:45
 msgid "Yes"
 msgstr "Oui"
 
@@ -687,19 +563,11 @@ msgid "Ref."
 msgstr "Ref."
 
 #: pcbnew/class_text_mod.cpp:509
-#: pcbnew/cotation.cpp:114
-#: pcbnew/dialog_edit_mod_text.cpp:291
-#: pcbnew/dialog_general_options.cpp:289
-#: pcbnew/pcbtexte.cpp:181
-#: eeschema/affiche.cpp:91
-#: gerbview/options.cpp:176
-#: gerbview/tool_gerber.cpp:113
 msgid "Display"
 msgstr "Affichage"
 
 #: pcbnew/class_track.cpp:868
 #: pcbnew/class_zone.cpp:628
-#: pcbnew/zones_by_polygon.cpp:859
 msgid "NetName"
 msgstr "NetName"
 
@@ -709,7 +577,6 @@ msgid "NetCode"
 msgstr "NetCode"
 
 #: pcbnew/class_track.cpp:881
-#: pcbnew/dialog_pad_edit.cpp:205
 msgid "Standard"
 msgstr "Standard"
 
@@ -746,10 +613,6 @@ msgid "Merge"
 msgstr "Merge"
 
 #: pcbnew/clean.cpp:464
-#: pcbnew/dialog_pad_edit.cpp:186
-#: eeschema/dialog_edit_component_in_schematic.cpp:172
-#: eeschema/dialog_erc.cpp:193
-#: eeschema/dialog_erc.cpp:197
 msgid "0"
 msgstr "0"
 
@@ -826,7 +689,6 @@ msgid "Clean pcb"
 msgstr "Nettoyage PCB"
 
 #: pcbnew/controle.cpp:172
-#: pcbnew/modedit.cpp:77
 msgid "Selection Clarification"
 msgstr "Clarification de la Sélection"
 
@@ -837,29 +699,14 @@ msgstr "Propriétés des Cotes"
 #: pcbnew/cotation.cpp:113
 #: pcbnew/dialog_edit_module.cpp:243
 #: pcbnew/dialog_edit_module.cpp:289
-#: pcbnew/muonde.cpp:360
-#: pcbnew/pcbtexte.cpp:180
-#: eeschema/dialog_edit_component_in_schematic.cpp:181
-#: eeschema/dialog_options.cpp:247
-#: eeschema/onrightclick.cpp:293
 msgid "Normal"
 msgstr "Normal"
 
 #: pcbnew/cotation.cpp:125
-#: pcbnew/mirepcb.cpp:108
-#: pcbnew/muonde.cpp:367
-#: pcbnew/pcbtexte.cpp:129
-#: eeschema/sheet.cpp:177
-#: eeschema/sheet.cpp:183
-#: eeschema/pinedit-dialog.cpp:208
-#: eeschema/pinedit-dialog.cpp:214
-#: common/wxwineda.cpp:91
 msgid "Size"
 msgstr "Taille "
 
 #: pcbnew/cotation.cpp:133
-#: pcbnew/dialog_zones_by_polygon.cpp:238
-#: gerbview/affiche.cpp:37
 msgid "Layer:"
 msgstr "Couche:"
 
@@ -897,9 +744,6 @@ msgstr "Pistes et vias"
 #: pcbnew/dialog_display_options.cpp:231
 #: pcbnew/dialog_display_options.cpp:244
 #: pcbnew/dialog_display_options.cpp:268
-#: pcbnew/pcbplot.cpp:415
-#: gerbview/options.cpp:298
-#: gerbview/options.cpp:321
 msgid "Sketch"
 msgstr "Contour"
 
@@ -908,10 +752,6 @@ msgstr "Contour"
 #: pcbnew/dialog_display_options.cpp:230
 #: pcbnew/dialog_display_options.cpp:245
 #: pcbnew/dialog_display_options.cpp:267
-#: pcbnew/pcbplot.cpp:415
-#: eeschema/dialog_cmp_graphic_properties.cpp:169
-#: gerbview/options.cpp:298
-#: gerbview/options.cpp:321
 msgid "Filled"
 msgstr "Plein"
 
@@ -982,12 +822,10 @@ msgid "Show Pad NoConnect"
 msgstr "Montrer non conn"
 
 #: pcbnew/dialog_display_options.cpp:269
-#: gerbview/options.cpp:322
 msgid "Display other items:"
 msgstr "Afficher autres éléments"
 
 #: pcbnew/dialog_display_options.cpp:276
-#: eeschema/dialog_options.cpp:281
 msgid "Show page limits"
 msgstr " Afficher limites de page"
 
@@ -997,24 +835,6 @@ msgstr " Afficher limites de page"
 #: pcbnew/dialog_general_options.cpp:479
 #: pcbnew/dialog_graphic_items_options.cpp:263
 #: pcbnew/dialog_initpcb.cpp:161
-#: pcbnew/dialog_track_options.cpp:322
-#: pcbnew/set_grid.cpp:171
-#: pcbnew/swap_layers.cpp:223
-#: pcbnew/dialog_pad_edit.cpp:215
-#: eeschema/dialog_build_BOM.cpp:344
-#: eeschema/dialog_cmp_graphic_properties.cpp:178
-#: eeschema/dialog_create_component.cpp:198
-#: eeschema/dialog_edit_component_in_lib.cpp:221
-#: eeschema/dialog_edit_component_in_schematic.cpp:241
-#: eeschema/dialog_edit_label.cpp:181
-#: eeschema/dialog_options.cpp:288
-#: eeschema/sheet.cpp:198
-#: eeschema/symbtext.cpp:177
-#: eeschema/pinedit-dialog.cpp:242
-#: cvpcb/dialog_display_options.cpp:187
-#: cvpcb/dialog_cvpcb_config.cpp:138
-#: gerbview/select_layers_to_pcb.cpp:285
-#: share/setpage.cpp:444
 msgid "&OK"
 msgstr "&OK"
 
@@ -1024,39 +844,15 @@ msgstr "&OK"
 #: pcbnew/dialog_general_options.cpp:485
 #: pcbnew/dialog_graphic_items_options.cpp:267
 #: pcbnew/dialog_initpcb.cpp:164
-#: pcbnew/dialog_track_options.cpp:328
-#: pcbnew/dialog_zones_by_polygon.cpp:207
-#: pcbnew/set_grid.cpp:176
-#: pcbnew/swap_layers.cpp:227
-#: pcbnew/dialog_pad_edit.cpp:219
-#: eeschema/dialog_cmp_graphic_properties.cpp:183
-#: eeschema/dialog_create_component.cpp:203
-#: eeschema/dialog_edit_component_in_lib.cpp:217
-#: eeschema/dialog_edit_component_in_schematic.cpp:233
-#: eeschema/dialog_edit_label.cpp:186
-#: eeschema/dialog_options.cpp:293
-#: eeschema/netlist_control.cpp:144
-#: eeschema/netlist_control.cpp:267
-#: eeschema/sheet.cpp:194
-#: eeschema/symbtext.cpp:182
-#: eeschema/pinedit-dialog.cpp:238
-#: cvpcb/dialog_display_options.cpp:192
-#: gerbview/select_layers_to_pcb.cpp:289
-#: share/setpage.cpp:448
 msgid "&Cancel"
 msgstr "&Annuler"
 
 #: pcbnew/dialog_drc.cpp:430
 #: pcbnew/dialog_netlist.cpp:193
-#: eeschema/dialog_create_component.cpp:179
-#: eeschema/dialog_edit_component_in_lib.cpp:169
-#: eeschema/dialog_edit_component_in_schematic.cpp:202
-#: eeschema/dialog_erc.cpp:239
 msgid "Options"
 msgstr "Options"
 
 #: pcbnew/dialog_drc.cpp:440
-#: pcbnew/dialog_track_options.cpp:290
 msgid "Clearance"
 msgstr "Isolation"
 
@@ -1097,7 +893,6 @@ msgid "Include tests for clearances between pad to pads"
 msgstr "Inclure test de l'isolation entre pads"
 
 #: pcbnew/dialog_drc.cpp:478
-#: pcbnew/onrightclick.cpp:646
 msgid "Zones"
 msgstr "Zones"
 
@@ -1195,13 +990,10 @@ msgid "Change module(s)"
 msgstr "Change module(s)"
 
 #: pcbnew/dialog_edit_module.cpp:186
-#: pcbnew/modedit_onclick.cpp:250
 msgid "Edit Module"
 msgstr "Edit Module"
 
 #: pcbnew/dialog_edit_module.cpp:193
-#: eeschema/dialog_edit_component_in_lib.cpp:206
-#: eeschema/onrightclick.cpp:343
 msgid "Doc"
 msgstr "Doc"
 
@@ -1218,7 +1010,6 @@ msgid "Add Field"
 msgstr "Ajouter Champ"
 
 #: pcbnew/dialog_edit_module.cpp:222
-#: eeschema/onrightclick.cpp:248
 msgid "Edit Field"
 msgstr "Editer Champ"
 
@@ -1227,7 +1018,6 @@ msgid "Delete Field"
 msgstr "Supprimer Champ"
 
 #: pcbnew/dialog_edit_module.cpp:234
-#: common/common.cpp:352
 msgid "Component"
 msgstr "Composant"
 
@@ -1236,7 +1026,6 @@ msgid "Copper"
 msgstr "Cuivre"
 
 #: pcbnew/dialog_edit_module.cpp:243
-#: pcbnew/dialog_pad_edit.cpp:190
 msgid "User"
 msgstr "User"
 
@@ -1305,7 +1094,6 @@ msgid "3D Shape Name"
 msgstr "3D forme"
 
 #: pcbnew/dialog_edit_module.cpp:395
-#: eeschema/dialog_eeschema_config.cpp:231
 msgid "Browse"
 msgstr "Examiner"
 
@@ -1376,7 +1164,6 @@ msgid "vertical"
 msgstr "Vertical"
 
 #: pcbnew/dialog_edit_mod_text.cpp:282
-#: pcbnew/pcbtexte.cpp:156
 msgid "Orientation"
 msgstr "Orientation"
 
@@ -1393,9 +1180,6 @@ msgid "Value:"
 msgstr "Valeur:"
 
 #: pcbnew/dialog_edit_mod_text.cpp:384
-#: pcbnew/pcbtexte.cpp:123
-#: eeschema/sheetlab.cpp:102
-#: common/confirm.cpp:145
 msgid "Text:"
 msgstr "Texte:"
 
@@ -1441,53 +1225,38 @@ msgstr "L' URL du site FreeRouting.net"
 
 #: pcbnew/dialog_freeroute_exchange.cpp:222
 #: pcbnew/dialog_netlist.cpp:253
-#: eeschema/dialog_build_BOM.cpp:348
-#: eeschema/dialog_erc.cpp:219
-#: eeschema/plothpgl.cpp:292
-#: share/dialog_print.cpp:242
 msgid "&Close"
 msgstr "&Fermer"
 
 #: pcbnew/dialog_general_options.cpp:288
-#: gerbview/options.cpp:175
 msgid "No Display"
 msgstr "Pas d'affichage"
 
 #: pcbnew/dialog_general_options.cpp:291
-#: gerbview/options.cpp:177
 msgid "Display Polar Coord"
 msgstr "Affichage coord Polaires"
 
 #: pcbnew/dialog_general_options.cpp:299
-#: pcbnew/set_grid.cpp:147
-#: pcbnew/dialog_gendrill.cpp:167
-#: gerbview/options.cpp:185
 msgid "Inches"
 msgstr "Pouces"
 
 #: pcbnew/dialog_general_options.cpp:300
-#: gerbview/options.cpp:186
 msgid "millimeters"
 msgstr "millimetres"
 
 #: pcbnew/dialog_general_options.cpp:302
-#: eeschema/dialog_options.cpp:264
-#: gerbview/options.cpp:187
 msgid "Units"
 msgstr "Unités"
 
 #: pcbnew/dialog_general_options.cpp:309
-#: gerbview/options.cpp:193
 msgid "Small"
 msgstr "Petit"
 
 #: pcbnew/dialog_general_options.cpp:310
-#: gerbview/options.cpp:193
 msgid "Big"
 msgstr "Grand"
 
 #: pcbnew/dialog_general_options.cpp:312
-#: gerbview/options.cpp:194
 msgid "Cursor"
 msgstr "Curseur"
 
@@ -1504,10 +1273,6 @@ msgid "Auto Save (minuts):"
 msgstr "Sauveg. Auto (min)"
 
 #: pcbnew/dialog_general_options.cpp:376
-#: pcbnew/dialog_gendrill.cpp:239
-#: eeschema/dialog_build_BOM.cpp:283
-#: eeschema/netlist_control.cpp:121
-#: share/dialog_print.cpp:187
 msgid "Options:"
 msgstr "Options :"
 
@@ -1536,7 +1301,6 @@ msgid "Segments 45 Only"
 msgstr "Segments 45 seulement"
 
 #: pcbnew/dialog_general_options.cpp:429
-#: eeschema/dialog_options.cpp:256
 msgid "Auto PAN"
 msgstr "Auto PAN"
 
@@ -1693,13 +1457,6 @@ msgid "Keep or change an existing footprint when the netlist gives a different f
 msgstr "Garder ou changer une empreinte existante quand la netliste donne une empreinte différente"
 
 #: pcbnew/dialog_netlist.cpp:186
-#: pcbnew/onrightclick.cpp:581
-#: pcbnew/onrightclick.cpp:762
-#: pcbnew/onrightclick.cpp:817
-#: pcbnew/onrightclick.cpp:866
-#: eeschema/edit_component_in_lib.cpp:239
-#: eeschema/edit_component_in_lib.cpp:320
-#: eeschema/menubar.cpp:146
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -1752,11 +1509,6 @@ msgid "Rebuild the full ratsnest (usefull after a manual pad netname edition)"
 msgstr "Recalculer le chevelu complet ( utile après une edition manuelle de nom de net sur pad)"
 
 #: pcbnew/dialog_netlist.cpp:232
-#: pcbnew/pcbplot.cpp:284
-#: pcbnew/xchgmod.cpp:137
-#: eeschema/annotate_dialog.cpp:230
-#: eeschema/plotps.cpp:227
-#: share/zoom.cpp:449
 msgid "Close"
 msgstr "Fermer"
 
@@ -1806,50 +1558,30 @@ msgid "Bad value for footprints orientation"
 msgstr "Mauvaise valeur pour l'orientation des empreintes"
 
 #: pcbnew/dialog_setup_libs.cpp:97
-#: eeschema/dialog_eeschema_config.cpp:105
-#: cvpcb/dialog_cvpcb_config.cpp:75
-#: gerbview/reglage.cpp:90
 msgid "from "
 msgstr "De "
 
 #: pcbnew/dialog_setup_libs.cpp:153
-#: eeschema/dialog_eeschema_config.cpp:161
-#: cvpcb/dialog_display_options.cpp:178
-#: cvpcb/dialog_cvpcb_config.cpp:128
 msgid "Save Cfg"
 msgstr "Sauver config"
 
 #: pcbnew/dialog_setup_libs.cpp:159
-#: eeschema/dialog_eeschema_config.cpp:178
-#: cvpcb/dialog_cvpcb_config.cpp:143
 msgid "Files ext:"
 msgstr "Ext. Fichiers"
 
 #: pcbnew/dialog_setup_libs.cpp:175
-#: cvpcb/dialog_cvpcb_config.cpp:162
-#: cvpcb/dialog_cvpcb_config.cpp:194
 msgid "Del"
 msgstr "Supprimer"
 
 #: pcbnew/dialog_setup_libs.cpp:179
-#: eeschema/dialog_eeschema_config.cpp:197
-#: eeschema/edit_component_in_lib.cpp:233
-#: eeschema/edit_component_in_lib.cpp:312
-#: cvpcb/dialog_cvpcb_config.cpp:166
-#: cvpcb/dialog_cvpcb_config.cpp:198
 msgid "Add"
 msgstr "Ajouter"
 
 #: pcbnew/dialog_setup_libs.cpp:183
-#: eeschema/dialog_eeschema_config.cpp:203
-#: cvpcb/dialog_cvpcb_config.cpp:170
-#: cvpcb/dialog_cvpcb_config.cpp:202
 msgid "Ins"
 msgstr "Insérer"
 
 #: pcbnew/dialog_setup_libs.cpp:191
-#: eeschema/dialog_eeschema_config.cpp:213
-#: cvpcb/dialog_cvpcb_config.cpp:177
 msgid "Libraries"
 msgstr "Librairies"
 
@@ -1858,7 +1590,6 @@ msgid "Lib Modules Dir:"
 msgstr "Repertoire Lib Modules:"
 
 #: pcbnew/dialog_setup_libs.cpp:206
-#: cvpcb/menucfg.cpp:62
 msgid "Module Doc File:"
 msgstr "Fichiers Doc des Modules"
 
@@ -1879,14 +1610,10 @@ msgid "Net ext: "
 msgstr "Net ext: "
 
 #: pcbnew/dialog_setup_libs.cpp:367
-#: cvpcb/menucfg.cpp:202
 msgid "Library Files:"
 msgstr "Fichiers Librairies:"
 
 #: pcbnew/dialog_setup_libs.cpp:392
-#: eeschema/dialog_eeschema_config.cpp:394
-#: cvpcb/menucfg.cpp:227
-#: cvpcb/menucfg.cpp:295
 msgid "Library already in use"
 msgstr "Librairie déjà en usage"
 
@@ -1907,7 +1634,6 @@ msgid "Alternate Via Drill"
 msgstr "Perçage vias alternatif"
 
 #: pcbnew/dialog_track_options.cpp:208
-#: pcbnew/pcbnew.h:294
 msgid "Through Via"
 msgstr "Via Traversante"
 
@@ -1920,7 +1646,6 @@ msgid "Default Via Type"
 msgstr "Via par Défaut"
 
 #: pcbnew/dialog_track_options.cpp:223
-#: pcbnew/dialog_gendrill.cpp:284
 msgid "Micro Vias:"
 msgstr "Micro Vias:"
 
@@ -1997,7 +1722,6 @@ msgid "Pad options:"
 msgstr "Options pads"
 
 #: pcbnew/dialog_zones_by_polygon.cpp:193
-#: eeschema/dialog_options.cpp:273
 msgid "Any"
 msgstr "Tout"
 
@@ -2111,10 +1835,6 @@ msgid "Add Graphic"
 msgstr "Addition éléments graphiques"
 
 #: pcbnew/edit.cpp:290
-#: pcbnew/tool_modedit.cpp:171
-#: eeschema/libframe.cpp:501
-#: eeschema/schedit.cpp:217
-#: gerbview/tool_gerber.cpp:385
 msgid "Add Text"
 msgstr "Ajout de Texte"
 
@@ -2135,9 +1855,6 @@ msgid "Local Ratsnest"
 msgstr "Monter le chevelu général"
 
 #: pcbnew/edit.cpp:552
-#: pcbnew/modedit.cpp:424
-#: eeschema/libframe.cpp:577
-#: eeschema/schedit.cpp:366
 msgid "Delete item"
 msgstr "Suppression d'éléments"
 
@@ -2227,20 +1944,6 @@ msgid "GenCAD file:"
 msgstr "Fichier GenCAD:"
 
 #: pcbnew/export_gencad.cpp:83
-#: pcbnew/files.cpp:352
-#: pcbnew/gen_modules_placefile.cpp:128
-#: pcbnew/gen_modules_placefile.cpp:139
-#: pcbnew/gen_modules_placefile.cpp:292
-#: pcbnew/librairi.cpp:308
-#: pcbnew/librairi.cpp:454
-#: pcbnew/librairi.cpp:604
-#: pcbnew/librairi.cpp:808
-#: pcbnew/plothpgl.cpp:67
-#: eeschema/plothpgl.cpp:601
-#: eeschema/plotps.cpp:433
-#: cvpcb/genequiv.cpp:42
-#: gerbview/export_to_pcbnew.cpp:75
-#: common/hotkeys_basic.cpp:385
 msgid "Unable to create "
 msgstr "Impossible de créer "
 
@@ -2250,12 +1953,6 @@ msgstr "Fichier de secours "
 
 #: pcbnew/files.cpp:56
 #: pcbnew/librairi.cpp:256
-#: eeschema/find.cpp:241
-#: eeschema/find.cpp:249
-#: eeschema/find.cpp:695
-#: gerbview/dcode.cpp:266
-#: gerbview/readgerb.cpp:145
-#: common/eda_doc.cpp:150
 msgid " not found"
 msgstr "  non trouvé"
 
@@ -2273,7 +1970,6 @@ msgstr "Charger Fichiers C.I.:"
 
 #: pcbnew/files.cpp:188
 #: pcbnew/librairi.cpp:77
-#: cvpcb/readschematicnetlist.cpp:110
 #, c-format
 msgid "File <%s> not found"
 msgstr " fichier %s non trouvé"
@@ -2325,7 +2021,6 @@ msgid "<%s> Not Found"
 msgstr "<%s> Non trouvé"
 
 #: pcbnew/find.cpp:238
-#: eeschema/dialog_find.cpp:117
 msgid "Item to find:"
 msgstr "Elément a chercher:"
 
@@ -2350,19 +2045,15 @@ msgid "Drill file"
 msgstr "Fichier de percage"
 
 #: pcbnew/gendrill.cpp:322
-#: pcbnew/gendrill.cpp:789
-#: pcbnew/plotps.cpp:51
-#: pcbnew/xchgmod.cpp:637
+#: pcbnew/gendrill.cpp:810
 msgid "Unable to create file "
 msgstr "Impossible de créer le fichier "
 
 #: pcbnew/gendrill.cpp:378
-#: pcbnew/dialog_gendrill.cpp:184
 msgid "2:3"
 msgstr "2:3"
 
 #: pcbnew/gendrill.cpp:379
-#: pcbnew/dialog_gendrill.cpp:185
 msgid "2:4"
 msgstr "2:4"
 
@@ -2374,15 +2065,15 @@ msgstr "3:2"
 msgid "3:3"
 msgstr "3:3"
 
-#: pcbnew/gendrill.cpp:728
+#: pcbnew/gendrill.cpp:749
 msgid "Drill Map file"
 msgstr "Fichier Plan de perçage"
 
-#: pcbnew/gendrill.cpp:743
+#: pcbnew/gendrill.cpp:764
 msgid "Unable to create file"
 msgstr "Impossible de créer le fichier "
 
-#: pcbnew/gendrill.cpp:774
+#: pcbnew/gendrill.cpp:795
 msgid "Drill Report file"
 msgstr "Fichier rapport de perçage:"
 
@@ -2488,7 +2179,6 @@ msgid "Delete draw items?"
 msgstr "Suppression éléments graphiques?"
 
 #: pcbnew/initpcb.cpp:249
-#: gerbview/initpcb.cpp:150
 msgid "Delete Tracks?"
 msgstr "Effacer Pistes ?"
 
@@ -2497,7 +2187,6 @@ msgid "Delete Modules?"
 msgstr "Effacement des Modules?"
 
 #: pcbnew/initpcb.cpp:295
-#: gerbview/initpcb.cpp:173
 msgid "Delete Pcb Texts"
 msgstr "Effacer Textes Pcb"
 
@@ -2528,7 +2217,6 @@ msgid "File %s exists, OK to replace ?"
 msgstr "Fichier %s existant, OK pour remplacer ?"
 
 #: pcbnew/librairi.cpp:203
-#: eeschema/symbedit.cpp:166
 #, c-format
 msgid "Unable to create <%s>"
 msgstr "Incapable de créer <%s>"
@@ -2575,8 +2263,6 @@ msgid "Library %s not found"
 msgstr "Librairie %s non trouvée"
 
 #: pcbnew/librairi.cpp:527
-#: eeschema/symbtext.cpp:143
-#: common/get_component_dialog.cpp:98
 msgid "Name:"
 msgstr "Nom:"
 
@@ -2631,7 +2317,6 @@ msgid "Module name:"
 msgstr "Nom module:"
 
 #: pcbnew/loadcmp.cpp:215
-#: eeschema/eelibs_read_libraryfiles.cpp:64
 #, c-format
 msgid "Library <%s> not found"
 msgstr "Librairie %s non trouvée"
@@ -2665,91 +2350,58 @@ msgid "Sizes and Widths"
 msgstr "Dims. et Epaiss."
 
 #: pcbnew/menubarmodedit.cpp:41
-#: pcbnew/menubarpcb.cpp:229
 msgid "Adjust width for texts and drawings"
 msgstr "Ajuster dims pour textes et graphiques"
 
 #: pcbnew/menubarmodedit.cpp:45
-#: pcbnew/menubarpcb.cpp:233
-#: pcbnew/modedit.cpp:396
-#: pcbnew/tool_modedit.cpp:124
 msgid "Pad Settings"
 msgstr "Caract pads"
 
 #: pcbnew/menubarmodedit.cpp:46
-#: pcbnew/menubarpcb.cpp:234
 msgid "Adjust size,shape,layers... for Pads"
 msgstr "Ajuster taille, forme, couches... pour pads"
 
 #: pcbnew/menubarmodedit.cpp:50
-#: pcbnew/menubarpcb.cpp:223
-#: pcbnew/set_grid.h:39
 msgid "User Grid Size"
 msgstr "Dim Grille utilisteur"
 
 #: pcbnew/menubarmodedit.cpp:51
-#: pcbnew/menubarpcb.cpp:224
 msgid "Adjust User Grid"
 msgstr "Ajuster Grille utilisateur"
 
 #: pcbnew/menubarmodedit.cpp:60
-#: pcbnew/menubarpcb.cpp:292
-#: eeschema/menubar.cpp:397
-#: cvpcb/tool_cvpcb.cpp:155
-#: kicad/buildmnu.cpp:190
-#: gerbview/tool_gerber.cpp:149
 msgid "&Contents"
 msgstr "&Contenu"
 
 #: pcbnew/menubarmodedit.cpp:60
-#: pcbnew/menubarpcb.cpp:292
 msgid "Open the pcbnew manual"
 msgstr "Ouvrir la documentation de pcbnew"
 
 #: pcbnew/menubarmodedit.cpp:64
-#: pcbnew/menubarpcb.cpp:296
-#: eeschema/menubar.cpp:402
-#: cvpcb/tool_cvpcb.cpp:159
-#: kicad/buildmnu.cpp:195
-#: gerbview/tool_gerber.cpp:151
 msgid "&About"
 msgstr "&Infos logiciel"
 
 #: pcbnew/menubarmodedit.cpp:64
-#: pcbnew/menubarpcb.cpp:296
-#: eeschema/menubar.cpp:402
-#: cvpcb/tool_cvpcb.cpp:160
-#: kicad/buildmnu.cpp:195
-#: gerbview/tool_gerber.cpp:152
 msgid "About this application"
 msgstr "Au sujet de cette application"
 
 #: pcbnew/menubarmodedit.cpp:72
-#: pcbnew/menubarpcb.cpp:304
 msgid "3D Display"
 msgstr "3D Visu"
 
 #: pcbnew/menubarmodedit.cpp:72
-#: pcbnew/menubarpcb.cpp:304
 msgid "Show Board in 3D Mode"
 msgstr "Visualisation en 3D"
 
 #: pcbnew/menubarmodedit.cpp:76
-#: pcbnew/menubarpcb.cpp:310
 msgid "&Dimensions"
 msgstr "&Dimensions"
 
 #: pcbnew/menubarmodedit.cpp:77
-#: pcbnew/menubarpcb.cpp:313
 msgid "&3D Display"
 msgstr "&3D Visu"
 
 #: pcbnew/menubarmodedit.cpp:78
-#: pcbnew/menubarpcb.cpp:314
-#: eeschema/menubar.cpp:412
-#: cvpcb/tool_cvpcb.cpp:166
-#: kicad/buildmnu.cpp:203
-#: gerbview/tool_gerber.cpp:159
 msgid "&Help"
 msgstr "&Aide"
 
@@ -2810,19 +2462,14 @@ msgid "Save current board as.."
 msgstr "Sauver le Circuit Imprimé courant sous.."
 
 #: pcbnew/menubarpcb.cpp:84
-#: eeschema/menubar.cpp:75
-#: gerbview/tool_gerber.cpp:88
 msgid "P&rint"
 msgstr "Imp&rimer"
 
 #: pcbnew/menubarpcb.cpp:84
-#: eeschema/menubar.cpp:75
-#: gerbview/tool_gerber.cpp:88
 msgid "Print on current printer"
 msgstr "Imprimer sur l'imprimante par défaut"
 
 #: pcbnew/menubarpcb.cpp:89
-#: eeschema/menubar.cpp:105
 msgid "&Plot"
 msgstr "&Tracer"
 
@@ -2871,7 +2518,6 @@ msgid "Import a routed \"Specctra Session\" (*.ses) file"
 msgstr "Importer un fichier de routage  \"Specctra Session\" (*.ses) "
 
 #: pcbnew/menubarpcb.cpp:133
-#: eeschema/libframe.cpp:525
 msgid "Import"
 msgstr "Importer"
 
@@ -2904,10 +2550,6 @@ msgid "Archive or Add footprints in a library file"
 msgstr "Archiver ou ajouter les modules dans un fichier librairie"
 
 #: pcbnew/menubarpcb.cpp:156
-#: eeschema/menubar.cpp:109
-#: cvpcb/tool_cvpcb.cpp:122
-#: kicad/buildmnu.cpp:122
-#: gerbview/tool_gerber.cpp:93
 msgid "E&xit"
 msgstr "&Quitter"
 
@@ -2916,19 +2558,14 @@ msgid "Quit pcbnew"
 msgstr "Quitter Pcbnew"
 
 #: pcbnew/menubarpcb.cpp:174
-#: eeschema/menubar.cpp:358
 msgid "&Libs and Dir"
 msgstr "&Libs et Rep"
 
 #: pcbnew/menubarpcb.cpp:175
-#: eeschema/menubar.cpp:359
-#: cvpcb/tool_cvpcb.cpp:137
 msgid "Setting Libraries, Directories and others..."
 msgstr "Sélectionner les librairies et répertoires"
 
 #: pcbnew/menubarpcb.cpp:179
-#: eeschema/menubar.cpp:364
-#: gerbview/tool_gerber.cpp:108
 msgid "&Colors"
 msgstr "&Couleurs"
 
@@ -2953,23 +2590,18 @@ msgid "Select what items are displayed"
 msgstr "Sélectionner les éléments a afficher"
 
 #: pcbnew/menubarpcb.cpp:200
-#: eeschema/menubar.cpp:382
 msgid "&Save preferences"
 msgstr "&Sauver Préférences"
 
 #: pcbnew/menubarpcb.cpp:201
-#: eeschema/menubar.cpp:383
-#: gerbview/tool_gerber.cpp:123
 msgid "Save application preferences"
 msgstr "Sauver préférences"
 
 #: pcbnew/menubarpcb.cpp:205
-#: eeschema/menubar.cpp:386
 msgid "&Read preferences"
 msgstr "&Lire Préférences"
 
 #: pcbnew/menubarpcb.cpp:206
-#: eeschema/menubar.cpp:387
 msgid "Read application preferences"
 msgstr "Lire préférences de l'application"
 
@@ -2982,12 +2614,10 @@ msgid "Adjust size and width for tracks, vias"
 msgstr "Ajuster dims et taille des pistes et vias"
 
 #: pcbnew/menubarpcb.cpp:228
-#: pcbnew/dialog_graphic_items_options.h:47
 msgid "Texts and Drawings"
 msgstr "Textes et Tracés"
 
 #: pcbnew/menubarpcb.cpp:239
-#: gerbview/tool_gerber.cpp:122
 msgid "&Save Setup"
 msgstr "&Sauver Options"
 
@@ -3052,24 +2682,14 @@ msgid "Swap tracks on copper layers or drawings on others layers"
 msgstr "Permutation de couches"
 
 #: pcbnew/menubarpcb.cpp:308
-#: eeschema/menubar.cpp:407
-#: cvpcb/tool_cvpcb.cpp:164
-#: gerbview/tool_gerber.cpp:154
-#: 3d-viewer/3d_toolbar.cpp:116
 msgid "&File"
 msgstr "&Fichiers"
 
 #: pcbnew/menubarpcb.cpp:309
-#: eeschema/menubar.cpp:411
-#: cvpcb/tool_cvpcb.cpp:165
-#: kicad/buildmnu.cpp:202
-#: gerbview/tool_gerber.cpp:155
-#: 3d-viewer/3d_toolbar.cpp:124
 msgid "&Preferences"
 msgstr "&Préférences"
 
 #: pcbnew/menubarpcb.cpp:311
-#: gerbview/tool_gerber.cpp:156
 msgid "&Miscellaneous"
 msgstr "&Divers"
 
@@ -3122,50 +2742,30 @@ msgid "Add Pad"
 msgstr "Ajouter Pastilles"
 
 #: pcbnew/modedit.cpp:406
-#: eeschema/schedit.cpp:197
 msgid "Add Drawing"
 msgstr "Ajout d'éléments graphiques"
 
 #: pcbnew/modedit.cpp:410
-#: pcbnew/tool_modedit.cpp:176
 msgid "Place anchor"
 msgstr "Place Ancre"
 
 #: pcbnew/modedit_onclick.cpp:196
-#: pcbnew/onrightclick.cpp:127
-#: eeschema/libedit_onrightclick.cpp:47
-#: eeschema/onrightclick.cpp:102
-#: gerbview/onrightclick.cpp:41
 msgid "End Tool"
 msgstr "Fin Outil"
 
 #: pcbnew/modedit_onclick.cpp:206
-#: pcbnew/onrightclick.cpp:447
-#: eeschema/libedit_onrightclick.cpp:231
-#: eeschema/onrightclick.cpp:609
-#: gerbview/onrightclick.cpp:50
 msgid "Cancel Block"
 msgstr "Annuler Bloc"
 
 #: pcbnew/modedit_onclick.cpp:208
-#: pcbnew/onrightclick.cpp:449
-#: eeschema/libedit_onrightclick.cpp:234
-#: gerbview/onrightclick.cpp:51
 msgid "Zoom Block (drag middle mouse)"
 msgstr "Zoom Bloc (drag bouton du milieu souris)"
 
 #: pcbnew/modedit_onclick.cpp:211
-#: pcbnew/onrightclick.cpp:452
-#: eeschema/libedit_onrightclick.cpp:238
-#: eeschema/onrightclick.cpp:617
-#: gerbview/onrightclick.cpp:53
 msgid "Place Block"
 msgstr "Place Bloc"
 
 #: pcbnew/modedit_onclick.cpp:213
-#: pcbnew/onrightclick.cpp:454
-#: eeschema/libedit_onrightclick.cpp:244
-#: eeschema/onrightclick.cpp:626
 msgid "Copy Block (shift + drag mouse)"
 msgstr "Copie Bloc (shift + drag mouse)"
 
@@ -3174,19 +2774,14 @@ msgid "Mirror Block (alt + drag mouse)"
 msgstr "Bloc Miroir (alt + drag mouse)"
 
 #: pcbnew/modedit_onclick.cpp:217
-#: pcbnew/onrightclick.cpp:458
 msgid "Rotate Block (ctrl + drag mouse)"
 msgstr "Rotation Bloc (ctrl + drag mouse)"
 
 #: pcbnew/modedit_onclick.cpp:219
-#: pcbnew/onrightclick.cpp:460
-#: eeschema/onrightclick.cpp:630
 msgid "Delete Block (shift+ctrl + drag mouse)"
 msgstr "Effacement Bloc (shift+ctrl + drag mouse)"
 
 #: pcbnew/modedit_onclick.cpp:241
-#: pcbnew/onrightclick.cpp:756
-#: pcbnew/onrightclick.cpp:860
 msgid "Rotate"
 msgstr "Rotation"
 
@@ -3211,17 +2806,14 @@ msgid "Move Pad"
 msgstr "Déplace Pad"
 
 #: pcbnew/modedit_onclick.cpp:263
-#: pcbnew/onrightclick.cpp:795
 msgid "Edit Pad"
 msgstr "Edit Pad"
 
 #: pcbnew/modedit_onclick.cpp:265
-#: pcbnew/onrightclick.cpp:799
 msgid "New Pad Settings"
 msgstr "Nouvelles Caract. Pads"
 
 #: pcbnew/modedit_onclick.cpp:267
-#: pcbnew/onrightclick.cpp:803
 msgid "Export Pad Settings"
 msgstr "Exporte Caract. Pads"
 
@@ -3230,7 +2822,6 @@ msgid "delete Pad"
 msgstr "Supprimer Pad"
 
 #: pcbnew/modedit_onclick.cpp:274
-#: pcbnew/onrightclick.cpp:810
 msgid "Global Pad Settings"
 msgstr "Edition Globale des pads"
 
@@ -3263,10 +2854,6 @@ msgid "Place edge"
 msgstr "Place contour"
 
 #: pcbnew/modedit_onclick.cpp:306
-#: pcbnew/onrightclick.cpp:724
-#: pcbnew/onrightclick.cpp:758
-#: pcbnew/onrightclick.cpp:862
-#: eeschema/onrightclick.cpp:300
 msgid "Edit"
 msgstr "Editer"
 
@@ -3303,13 +2890,10 @@ msgid "Footprint name:"
 msgstr "Nom Module: "
 
 #: pcbnew/modules.cpp:305
-#: pcbnew/onrightclick.cpp:730
 msgid "Delete Module"
 msgstr "Supprimer Module"
 
 #: pcbnew/modules.cpp:306
-#: eeschema/find.cpp:220
-#: eeschema/onrightclick.cpp:304
 msgid "Value "
 msgstr "Valeur "
 
@@ -3339,7 +2923,6 @@ msgid "Arc Stub"
 msgstr "Arc Stub"
 
 #: pcbnew/muonde.cpp:175
-#: common/common.cpp:97
 msgid " (mm):"
 msgstr " (mm):"
 
@@ -3349,7 +2932,6 @@ msgstr " (pouce):"
 
 #: pcbnew/muonde.cpp:189
 #: pcbnew/muonde.cpp:202
-#: pcbnew/gen_self.h:231
 msgid "Incorrect number, abort"
 msgstr "Nombre incorrect, arret"
 
@@ -3410,7 +2992,6 @@ msgid "Gap (inch):"
 msgstr "Gap (inch):"
 
 #: pcbnew/muwave_command.cpp:52
-#: eeschema/libframe.cpp:517
 msgid "Add Line"
 msgstr "Addition de lignes"
 
@@ -3513,26 +3094,20 @@ msgid "Cotation not authorized on Copper layers"
 msgstr "Cotation non autorisée sur Couches Cuivre"
 
 #: pcbnew/pcbcfg.cpp:71
-#: eeschema/eeconfig.cpp:60
-#: cvpcb/menucfg.cpp:140
 msgid "Read config file"
 msgstr "Lire config"
 
 #: pcbnew/pcbcfg.cpp:85
-#: cvpcb/menucfg.cpp:152
 #, c-format
 msgid "File %s not found"
 msgstr " fichier %s non trouvé"
 
 #: pcbnew/pcbcfg.cpp:204
-#: eeschema/eeconfig.cpp:199
-#: cvpcb/cfg.cpp:75
 msgid "Save preferences"
 msgstr "Sauver préférences"
 
 #: pcbnew/pcbplot.cpp:147
 #: pcbnew/pcbplot.cpp:272
-#: gerbview/tool_gerber.cpp:90
 msgid "Plot"
 msgstr "Tracer"
 
@@ -3589,7 +3164,6 @@ msgid "X scale adjust"
 msgstr "Ajustage Echelle X"
 
 #: pcbnew/pcbplot.cpp:259
-#: share/wxprint.cpp:189
 msgid "Set X scale adjust for exact scale plotting"
 msgstr "Ajuster échelle X pour traçage à l'échelle exacte"
 
@@ -3598,7 +3172,6 @@ msgid "Y scale adjust"
 msgstr "Ajustage Echelle Y"
 
 #: pcbnew/pcbplot.cpp:264
-#: share/wxprint.cpp:190
 msgid "Set Y scale adjust for exact scale plotting"
 msgstr "Ajuster échelle Y pour traçage à l'échelle exacte"
 
@@ -3619,7 +3192,6 @@ msgid "Exclude Edges_Pcb layer"
 msgstr "Exclure Couche Contours PCB"
 
 #: pcbnew/pcbplot.cpp:332
-#: share/dialog_print.cpp:149
 msgid "Exclude contents of Edges_Pcb layer from all other layers"
 msgstr "Exclure les tracés contour PCB des autres couches"
 
@@ -3704,12 +3276,10 @@ msgid "Scale 1.5"
 msgstr "Echelle 1,5"
 
 #: pcbnew/pcbplot.cpp:406
-#: share/dialog_print.cpp:163
 msgid "Scale 2"
 msgstr "Echelle 2"
 
 #: pcbnew/pcbplot.cpp:406
-#: share/dialog_print.cpp:164
 msgid "Scale 3"
 msgstr "Echelle 3"
 
@@ -3818,13 +3388,10 @@ msgstr "Attention: Les couches dessus et dessous sont les mêmes"
 
 #: pcbnew/set_color.cpp:269
 #: pcbnew/set_color.cpp:296
-#: 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:267
 msgid "Show All"
 msgstr "Tout Afficher"
 
@@ -3837,13 +3404,10 @@ msgid "Switch off all of the copper layers"
 msgstr "N'affiche pas les couches cuivre"
 
 #: pcbnew/set_color.cpp:361
-#: eeschema/eelayer.cpp:260
-#: gerbview/set_color.cpp:333
 msgid "Apply"
 msgstr "Appliquer"
 
 #: pcbnew/set_grid.cpp:148
-#: share/drawframe.cpp:377
 msgid "mm"
 msgstr "mm"
 
@@ -3972,7 +3536,6 @@ msgid "Deselect this layer to select the No Change state"
 msgstr "Deselectionner cette couche pour restorer l'option Pas de Changement"
 
 #: pcbnew/tool_modedit.cpp:44
-#: eeschema/tool_lib.cpp:120
 msgid "Select working library"
 msgstr "Sélection de la librairie de travail"
 
@@ -3989,7 +3552,6 @@ msgid "Delete part in current library"
 msgstr "Supprimer composant en librairie de travail"
 
 #: pcbnew/tool_modedit.cpp:61
-#: pcbnew/xchgmod.cpp:156
 msgid "New Module"
 msgstr "Nouveau Module"
 
@@ -4018,16 +3580,10 @@ msgid "export module"
 msgstr "Exporter Module"
 
 #: pcbnew/tool_modedit.cpp:92
-#: eeschema/menubar.cpp:130
-#: eeschema/tool_lib.cpp:147
-#: eeschema/tool_sch.cpp:74
 msgid "Undo last edition"
 msgstr "Defait dernière édition"
 
 #: pcbnew/tool_modedit.cpp:94
-#: eeschema/menubar.cpp:138
-#: eeschema/tool_lib.cpp:149
-#: eeschema/tool_sch.cpp:77
 msgid "Redo the last undo command"
 msgstr "Refait la dernière commande defaite"
 
@@ -4040,36 +3596,18 @@ msgid "Print Module"
 msgstr "Imprimer Module"
 
 #: pcbnew/tool_modedit.cpp:106
-#: pcbnew/tool_pcb.cpp:255
-#: eeschema/tool_lib.cpp:167
-#: eeschema/tool_sch.cpp:92
-#: gerbview/tool_gerber.cpp:271
 msgid "zoom +"
 msgstr "zoom +"
 
 #: pcbnew/tool_modedit.cpp:110
-#: pcbnew/tool_pcb.cpp:259
-#: eeschema/tool_lib.cpp:171
-#: eeschema/tool_sch.cpp:96
-#: gerbview/tool_gerber.cpp:278
 msgid "zoom -"
 msgstr "zoom -"
 
 #: pcbnew/tool_modedit.cpp:114
-#: pcbnew/tool_pcb.cpp:263
-#: eeschema/menubar.cpp:193
-#: eeschema/tool_lib.cpp:175
-#: eeschema/tool_sch.cpp:100
-#: gerbview/tool_gerber.cpp:285
 msgid "redraw"
 msgstr "Redessin"
 
 #: pcbnew/tool_modedit.cpp:119
-#: pcbnew/tool_pcb.cpp:268
-#: eeschema/tool_lib.cpp:181
-#: eeschema/tool_sch.cpp:105
-#: gerbview/tool_gerber.cpp:296
-#: 3d-viewer/3d_toolbar.cpp:52
 msgid "auto zoom"
 msgstr "Zoom automatique"
 
@@ -4082,65 +3620,42 @@ msgid "Add Pads"
 msgstr "Addition de \"pins\""
 
 #: pcbnew/tool_modedit.cpp:159
-#: pcbnew/tool_pcb.cpp:429
 msgid "Add graphic line or polygon"
 msgstr "Addition de lignes ou polygones graphiques"
 
 #: pcbnew/tool_modedit.cpp:163
-#: pcbnew/tool_pcb.cpp:433
 msgid "Add graphic circle"
 msgstr "Addition de graphiques (Cercle)"
 
 #: pcbnew/tool_modedit.cpp:167
-#: pcbnew/tool_pcb.cpp:437
 msgid "Add graphic arc"
 msgstr "Addition de graphiques (Arc de Cercle)"
 
 #: pcbnew/tool_modedit.cpp:181
-#: pcbnew/tool_pcb.cpp:455
-#: eeschema/menubar.cpp:146
-#: eeschema/tool_lib.cpp:90
-#: eeschema/tool_sch.cpp:228
-#: gerbview/tool_gerber.cpp:393
 msgid "Delete items"
 msgstr "Suppression d'éléments"
 
 #: pcbnew/tool_modedit.cpp:203
-#: pcbnew/tool_pcb.cpp:328
-#: eeschema/tool_sch.cpp:250
-#: gerbview/tool_gerber.cpp:417
 msgid "Display Grid OFF"
 msgstr "Suppression de l'affichage de la grille"
 
 #: pcbnew/tool_modedit.cpp:207
-#: pcbnew/tool_pcb.cpp:331
-#: gerbview/tool_gerber.cpp:423
 msgid "Display Polar Coord ON"
 msgstr "Activer affichage coord Polaires"
 
 #: pcbnew/tool_modedit.cpp:211
-#: pcbnew/tool_pcb.cpp:333
-#: eeschema/tool_sch.cpp:254
-#: gerbview/tool_gerber.cpp:427
 msgid "Units = Inch"
 msgstr "Unités = pouce"
 
 #: pcbnew/tool_modedit.cpp:215
-#: pcbnew/tool_pcb.cpp:335
-#: eeschema/tool_sch.cpp:258
-#: gerbview/tool_gerber.cpp:431
 msgid "Units = mm"
 msgstr "Unités = mm"
 
 #: pcbnew/tool_modedit.cpp:221
-#: pcbnew/tool_pcb.cpp:338
-#: eeschema/tool_sch.cpp:262
-#: gerbview/tool_gerber.cpp:437
 msgid "Change Cursor Shape"
 msgstr "Sélection de la forme du curseur"
 
 #: pcbnew/tool_modedit.cpp:229
-#: pcbnew/tool_pcb.cpp:360
 msgid "Show Pads Sketch"
 msgstr "Afficher pastilles en contour"
 
@@ -4153,9 +3668,6 @@ msgid "Show Edges Sketch"
 msgstr "Afficher Modules en contour"
 
 #: pcbnew/tool_modedit.cpp:276
-#: pcbnew/tool_pcb.cpp:577
-#: eeschema/plotps.cpp:189
-#: share/zoom.cpp:368
 msgid "Auto"
 msgstr "Auto"
 
@@ -4175,7 +3687,6 @@ msgid "Grid %.3f"
 msgstr "Grille %.3f"
 
 #: pcbnew/tool_modedit.cpp:305
-#: pcbnew/tool_pcb.cpp:611
 msgid "User Grid"
 msgstr "Grille perso"
 
@@ -4200,8 +3711,6 @@ msgid "Save Board"
 msgstr "Sauver Circuit Imprimé"
 
 #: pcbnew/tool_pcb.cpp:231
-#: eeschema/tool_sch.cpp:49
-#: gerbview/tool_gerber.cpp:232
 msgid "page settings (size, texts)"
 msgstr "Ajustage de la feuille de dessin (dimensions, textes)"
 
@@ -4210,25 +3719,18 @@ msgid "Open Module Editor"
 msgstr "Ouvrir Editeur de modules"
 
 #: pcbnew/tool_pcb.cpp:238
-#: eeschema/tool_sch.cpp:65
-#: gerbview/tool_gerber.cpp:243
 msgid "Cut selected item"
 msgstr "Suppression des éléments sélectionnés"
 
 #: pcbnew/tool_pcb.cpp:242
-#: eeschema/tool_sch.cpp:68
-#: gerbview/tool_gerber.cpp:248
 msgid "Copy selected item"
 msgstr "Copie des éléments sélectionnés"
 
 #: pcbnew/tool_pcb.cpp:244
-#: eeschema/tool_sch.cpp:71
-#: gerbview/tool_gerber.cpp:254
 msgid "Paste"
 msgstr "Copie des éléments sauvegardés"
 
 #: pcbnew/tool_pcb.cpp:247
-#: gerbview/tool_gerber.cpp:261
 msgid "Undelete"
 msgstr "Annulation du dernier effacement"
 
@@ -4241,8 +3743,6 @@ msgid "Plot (HPGL, PostScript, or GERBER format)"
 msgstr "Tracer en format HPGL,  POSTSCRIPT ou GERBER"
 
 #: pcbnew/tool_pcb.cpp:272
-#: eeschema/menubar.cpp:154
-#: eeschema/tool_sch.cpp:109
 msgid "Find components and texts"
 msgstr "Recherche de composants et textes"
 
@@ -4283,8 +3783,6 @@ msgid "Enable Auto Del Track"
 msgstr "Autoriser l'effacement automatique des pistes"
 
 #: pcbnew/tool_pcb.cpp:355
-#: pcbnew/pcbframe.cpp:434
-#: pcbnew/set_color.h:423
 msgid "Show Zones"
 msgstr "Monter Zones"
 
@@ -4293,7 +3791,6 @@ msgid "Show Tracks Sketch"
 msgstr "Afficher Pistes en Contour"
 
 #: pcbnew/tool_pcb.cpp:368
-#: pcbnew/pcbframe.cpp:455
 msgid "Hight Contrast Mode Display"
 msgstr "Mode d'affichage Haut Contraste"
 
@@ -4334,7 +3831,6 @@ msgid "Add dimension"
 msgstr "Ajout des cotes"
 
 #: pcbnew/tool_pcb.cpp:450
-#: gerbview/tool_gerber.cpp:378
 msgid "Add layer alignment target"
 msgstr "Ajouter Mire de superposition"
 
@@ -4375,10 +3871,6 @@ msgid "Zoom "
 msgstr "Zoom "
 
 #: pcbnew/tool_pcb.cpp:595
-#: eeschema/eelayer.cpp:223
-#: pcbnew/set_color.h:414
-#: eeschema/eelayer.h:214
-#: gerbview/set_color.h:324
 msgid "Grid"
 msgstr "Grille"
 
@@ -4534,7 +4026,6 @@ msgid "Move Drawing"
 msgstr "Déplace Tracé"
 
 #: pcbnew/onrightclick.cpp:238
-#: eeschema/onrightclick.cpp:208
 msgid "End Drawing"
 msgstr "Fin tracé"
 
@@ -4543,7 +4034,6 @@ msgid "Edit Drawing"
 msgstr "Edit Tracé"
 
 #: pcbnew/onrightclick.cpp:243
-#: eeschema/onrightclick.cpp:210
 msgid "Delete Drawing"
 msgstr "Supprimer Tracé"
 
@@ -4560,7 +4050,6 @@ msgid "Delete Last Corner"
 msgstr "Supprimer Dernier Sommet"
 
 #: pcbnew/onrightclick.cpp:275
-#: eeschema/onrightclick.cpp:155
 msgid "Delete Marker"
 msgstr "Effacer Marqueur"
 
@@ -4901,7 +4390,6 @@ msgid "Rotate  +"
 msgstr "Rotation +"
 
 #: pcbnew/onrightclick.cpp:719
-#: eeschema/onrightclick.cpp:288
 msgid "Rotate -"
 msgstr "Rotation -"
 
@@ -4986,12 +4474,10 @@ msgid "90"
 msgstr "90"
 
 #: pcbnew/dialog_pad_edit.cpp:188
-#: eeschema/dialog_edit_component_in_schematic.cpp:175
 msgid "-90"
 msgstr "-90"
 
 #: pcbnew/dialog_pad_edit.cpp:189
-#: eeschema/dialog_edit_component_in_schematic.cpp:174
 msgid "180"
 msgstr "180"
 
@@ -5012,7 +4498,6 @@ msgid "SMD"
 msgstr "CMS"
 
 #: pcbnew/dialog_pad_edit.cpp:207
-#: eeschema/netlist.cpp:245
 msgid "Conn"
 msgstr "Conn"
 
@@ -5161,8 +4646,6 @@ msgstr "Choisir l'origine des coordonnées: absolue ou relative à l'axe auxilia
 
 #: pcbnew/dialog_gendrill.cpp:205
 #: pcbnew/dialog_gendrill.cpp:215
-#: eeschema/libedit.cpp:41
-#: eeschema/viewlibs.cpp:120
 msgid "None"
 msgstr "Aucun"
 
@@ -5203,7 +4686,6 @@ msgid "Speed (cm/s)"
 msgstr "Vitesse plume ( cm/s )"
 
 #: pcbnew/dialog_gendrill.cpp:233
-#: eeschema/plothpgl.cpp:256
 msgid "Pen Number"
 msgstr "Numéro de plume"
 
@@ -5260,9 +4742,6 @@ msgid "Board modified, Save before exit ?"
 msgstr "Circuit Imprimé modifiée,  Sauver avant de quitter ?"
 
 #: pcbnew/pcbframe.cpp:281
-#: eeschema/schframe.cpp:310
-#: cvpcb/cvframe.cpp:178
-#: common/confirm.cpp:119
 msgid "Confirmation"
 msgstr "Confirmation"
 
@@ -5283,12 +4762,10 @@ msgid "Display Polar Coords"
 msgstr "Affichage coord Polaires"
 
 #: pcbnew/pcbframe.cpp:402
-#: eeschema/schframe.cpp:410
 msgid "Grid not show"
 msgstr "Grille non montrée"
 
 #: pcbnew/pcbframe.cpp:402
-#: eeschema/schframe.cpp:410
 msgid "Show Grid"
 msgstr "Afficher grille"
 
@@ -5341,7 +4818,6 @@ msgid "Normal Contrast Mode Display"
 msgstr "Mode d'affichage Contraste normal"
 
 #: eeschema/affiche.cpp:22
-#: eeschema/dialog_create_component.cpp:160
 msgid "Name"
 msgstr "Nom"
 
@@ -5350,7 +4826,6 @@ msgid "FileName"
 msgstr "Nom Fichier"
 
 #: eeschema/affiche.cpp:37
-#: eeschema/component_class.cpp:72
 msgid "Ref"
 msgstr "Ref"
 
@@ -5375,7 +4850,6 @@ msgid "PinName"
 msgstr "Nom Pin"
 
 #: eeschema/affiche.cpp:79
-#: eeschema/eelayer.h:140
 msgid "PinNum"
 msgstr "Num Pin"
 
@@ -5398,44 +4872,31 @@ msgid "Lengh"
 msgstr "Long."
 
 #: eeschema/affiche.cpp:101
-#: eeschema/dialog_edit_label.cpp:150
-#: eeschema/pinedit-dialog.cpp:225
 msgid "Up"
 msgstr "Haut"
 
 #: eeschema/affiche.cpp:104
-#: eeschema/dialog_edit_label.cpp:152
-#: eeschema/pinedit-dialog.cpp:226
 msgid "Down"
 msgstr "Bas"
 
 #: eeschema/affiche.cpp:107
-#: eeschema/dialog_edit_label.cpp:151
-#: eeschema/pinedit-dialog.cpp:224
 msgid "Left"
 msgstr "Gauche"
 
 #: eeschema/affiche.cpp:110
-#: eeschema/dialog_edit_label.cpp:149
-#: eeschema/pinedit-dialog.cpp:223
 msgid "Right"
 msgstr "Droite"
 
 #: eeschema/affiche.cpp:168
 #: eeschema/affiche.cpp:174
-#: share/svg_print.cpp:229
-#: share/dialog_print.cpp:218
 msgid "All"
 msgstr "Tout"
 
 #: eeschema/affiche.cpp:171
-#: eeschema/onrightclick.cpp:328
 msgid "Unit"
 msgstr "Unité"
 
 #: eeschema/affiche.cpp:181
-#: eeschema/dialog_edit_component_in_schematic.cpp:191
-#: eeschema/onrightclick.cpp:315
 msgid "Convert"
 msgstr "Convert"
 
@@ -5627,14 +5088,6 @@ msgstr ""
 "#End List\n"
 
 #: eeschema/build_BOM.cpp:691
-#: eeschema/component_class.cpp:76
-#: eeschema/component_class.cpp:77
-#: eeschema/component_class.cpp:78
-#: eeschema/component_class.cpp:79
-#: eeschema/component_class.cpp:80
-#: eeschema/component_class.cpp:81
-#: eeschema/component_class.cpp:82
-#: eeschema/component_class.cpp:83
 msgid "Field"
 msgstr "Champ"
 
@@ -5710,8 +5163,6 @@ msgid "%8.8lX/"
 msgstr "%8.8lX/"
 
 #: eeschema/component_class.cpp:75
-#: eeschema/eeredraw.cpp:130
-#: eeschema/eelayer.h:171
 msgid "Sheet"
 msgstr "Feuille"
 
@@ -5758,7 +5209,6 @@ msgid "Hierachy Pins by Sheets"
 msgstr "Pins de hiérarchie par feuilles"
 
 #: eeschema/dialog_build_BOM.cpp:269
-#: eeschema/netlist.cpp:197
 msgid "List"
 msgstr "Liste"
 
@@ -5831,7 +5281,6 @@ msgid "Create &List"
 msgstr "Créer &Liste"
 
 #: eeschema/dialog_build_BOM.cpp:352
-#: cvpcb/dialog_display_options.cpp:196
 msgid "&Apply"
 msgstr "&Appliquer"
 
@@ -5840,14 +5289,10 @@ msgid "Options :"
 msgstr "Options :"
 
 #: eeschema/dialog_cmp_graphic_properties.cpp:156
-#: eeschema/symbtext.cpp:162
-#: eeschema/pinedit-dialog.cpp:193
 msgid "Common to Units"
 msgstr "Commun aux Unités"
 
 #: eeschema/dialog_cmp_graphic_properties.cpp:160
-#: eeschema/symbtext.cpp:166
-#: eeschema/pinedit-dialog.cpp:197
 msgid "Common to convert"
 msgstr "Commun a converti"
 
@@ -5864,18 +5309,14 @@ msgid "Fill:"
 msgstr "Remplissage:"
 
 #: eeschema/dialog_create_component.cpp:183
-#: eeschema/edit_component_in_lib.cpp:401
 msgid "As Convert"
 msgstr "A une forme \"convertie\""
 
 #: eeschema/dialog_create_component.cpp:187
-#: eeschema/dialog_edit_component_in_lib.cpp:161
 msgid "Power Symbol"
 msgstr "Symbole Alimentation"
 
 #: eeschema/dialog_create_component.cpp:191
-#: eeschema/dialog_edit_component_in_lib.cpp:165
-#: eeschema/dialog_edit_component_in_schematic.cpp:188
 msgid "Parts are locked"
 msgstr "Les parts sont verrouillées"
 
@@ -5996,17 +5437,14 @@ msgid "Show Pin Number"
 msgstr "Montrer Numéro de Pin"
 
 #: eeschema/dialog_create_component.cpp:254
-#: eeschema/edit_component_in_lib.cpp:418
 msgid "Show Pin Name"
 msgstr "Montre Nom de Pin"
 
 #: eeschema/dialog_create_component.cpp:258
-#: eeschema/edit_component_in_lib.cpp:429
 msgid "Pin Name Inside"
 msgstr "Nom de pin a l'intérieur"
 
 #: eeschema/dialog_create_component.cpp:262
-#: eeschema/dialog_edit_component_in_lib.cpp:155
 msgid "Skew:"
 msgstr "Décalage:"
 
@@ -6169,7 +5607,6 @@ msgid "Orient:"
 msgstr "Orient:"
 
 #: eeschema/dialog_edit_component_in_schematic.cpp:182
-#: eeschema/onrightclick.cpp:289
 msgid "Mirror --"
 msgstr "Miroir--"
 
@@ -6192,13 +5629,11 @@ msgstr "Texte visible"
 
 #: eeschema/dialog_edit_component_in_schematic.cpp:216
 #: eeschema/edit_component_in_lib.cpp:502
-#: eeschema/symbtext.cpp:170
 msgid "Vertical"
 msgstr "Vertical"
 
 #: eeschema/dialog_edit_component_in_schematic.cpp:226
 #: eeschema/edit_component_in_lib.cpp:484
-#: eeschema/eelayer.h:164
 msgid "Fields"
 msgstr "Champs"
 
@@ -6231,19 +5666,14 @@ msgid "Text Orient:"
 msgstr "Orient:"
 
 #: eeschema/dialog_edit_label.cpp:160
-#: eeschema/pinedit-dialog.cpp:264
-#: eeschema/component_wizard/ki_component_setup.cpp:219
 msgid "Input"
 msgstr "Entrée"
 
 #: eeschema/dialog_edit_label.cpp:161
-#: eeschema/pinedit-dialog.cpp:265
-#: eeschema/component_wizard/ki_component_setup.cpp:220
 msgid "Output"
 msgstr "Sortie"
 
 #: eeschema/dialog_edit_label.cpp:162
-#: eeschema/pinedit-dialog.cpp:266
 msgid "Bidi"
 msgstr "Bidi"
 
@@ -6252,8 +5682,6 @@ msgid "TriState"
 msgstr "3 états"
 
 #: eeschema/dialog_edit_label.cpp:164
-#: eeschema/pinedit-dialog.cpp:268
-#: eeschema/component_wizard/ki_component_setup.cpp:223
 msgid "Passive"
 msgstr "Passive"
 
@@ -6476,7 +5904,6 @@ msgid "Delta Label:"
 msgstr "Incrément Label:"
 
 #: eeschema/dialog_options.cpp:326
-#: eeschema/plotps.cpp:248
 msgid "Default Line Width"
 msgstr "Epaiss. ligne par défaut"
 
@@ -6485,7 +5912,6 @@ msgid "Default Label Size"
 msgstr "Taille Label par défaut:"
 
 #: eeschema/edit_component_in_lib.cpp:168
-#: eeschema/dialog_edit_component_in_lib.h:56
 msgid "Lib Component Properties"
 msgstr "Propriétés du composant librairie"
 
@@ -6520,7 +5946,6 @@ msgstr "Justifié à gauche"
 
 #: eeschema/edit_component_in_lib.cpp:476
 #: eeschema/edit_component_in_lib.cpp:478
-#: share/zoom.cpp:360
 msgid "Center"
 msgstr "Centrer"
 
@@ -6606,7 +6031,6 @@ msgid "Delete Convert items"
 msgstr "Suppression des éléments convertis"
 
 #: eeschema/edit_component_in_lib.cpp:1144
-#: common/eda_doc.cpp:134
 msgid "Doc Files"
 msgstr "Fichiers de Doc"
 
@@ -6656,9 +6080,6 @@ msgid "Empty Text!"
 msgstr "Texte vide"
 
 #: eeschema/eeconfig.cpp:73
-#: kicad/files-io.cpp:131
-#: gerbview/dcode.cpp:266
-#: gerbview/readgerb.cpp:145
 msgid "File "
 msgstr "Fichier "
 
@@ -6671,7 +6092,6 @@ msgid "White"
 msgstr "Blanc"
 
 #: eeschema/eelayer.cpp:234
-#: share/dialog_print.cpp:204
 msgid "Black"
 msgstr "Noir"
 
@@ -6741,12 +6161,10 @@ msgid "Warning More than 1 Pin connected to UnConnect symbol"
 msgstr "Warning: plus que 1 Pin connectée a un symbole de non connexion"
 
 #: eeschema/erc.cpp:595
-#: common/confirm.cpp:84
 msgid "Warning"
 msgstr "Avertissement"
 
 #: eeschema/erc.cpp:598
-#: common/confirm.cpp:88
 msgid "Error"
 msgstr "Erreur"
 
@@ -6795,7 +6213,6 @@ msgid "Clear Schematic Hierarchy (modified!)?"
 msgstr "Effacer la hiérarchie schématique (modifiée!)?"
 
 #: eeschema/files-io.cpp:82
-#: eeschema/save_schemas.cpp:61
 msgid "Schematic files:"
 msgstr "Fichiers schématiques:"
 
@@ -6847,7 +6264,6 @@ msgid " Not Found"
 msgstr " Non trouvé"
 
 #: eeschema/find.cpp:653
-#: eeschema/selpart.cpp:39
 msgid "No libraries are loaded"
 msgstr "Pas de librairies chargées"
 
@@ -6901,12 +6317,10 @@ msgid "Root"
 msgstr "Racine"
 
 #: eeschema/hotkeys.cpp:249
-#: eeschema/schedit.cpp:241
 msgid "Add Component"
 msgstr "Ajout Composant"
 
 #: eeschema/hotkeys.cpp:271
-#: eeschema/schedit.cpp:189
 msgid "Add Wire"
 msgstr "Ajouter Fils"
 
@@ -7064,7 +6478,6 @@ msgid "Move Text "
 msgstr "Déplacer Texte"
 
 #: eeschema/libedit_onrightclick.cpp:126
-#: eeschema/dialog_edit_label.h:44
 msgid "Text Editor"
 msgstr "Editeur de Texte"
 
@@ -7279,7 +6692,6 @@ msgid "Done Loading "
 msgstr "Chargement terminé"
 
 #: eeschema/menubar.cpp:41
-#: gerbview/tool_gerber.cpp:63
 msgid "&New"
 msgstr "&Nouveau"
 
@@ -7288,7 +6700,6 @@ msgid "New schematic"
 msgstr "Nouvelle schématique"
 
 #: eeschema/menubar.cpp:47
-#: cvpcb/tool_cvpcb.cpp:109
 msgid "&Open"
 msgstr "&Ouvrir "
 
@@ -7301,7 +6712,6 @@ msgid "&Save"
 msgstr "&Sauver"
 
 #: eeschema/menubar.cpp:55
-#: eeschema/tool_sch.cpp:45
 msgid "Save schematic project"
 msgstr "Sauver le Projet schématique"
 
@@ -7370,7 +6780,6 @@ msgid "&Redo\t"
 msgstr "&Redo\t"
 
 #: eeschema/menubar.cpp:154
-#: pcbnew/find.h:38
 msgid "Find"
 msgstr "Chercher"
 
@@ -7384,13 +6793,11 @@ msgstr "Rétroannotation des Champs Modules"
 
 #: eeschema/menubar.cpp:169
 #: eeschema/menubar.cpp:172
-#: share/zoom.cpp:361
 msgid "Zoom in"
 msgstr "Zoom +"
 
 #: eeschema/menubar.cpp:177
 #: eeschema/menubar.cpp:180
-#: share/zoom.cpp:362
 msgid "Zoom out"
 msgstr "Zoom -"
 
@@ -7404,7 +6811,6 @@ msgid "&Component"
 msgstr "&Composant"
 
 #: eeschema/menubar.cpp:206
-#: eeschema/tool_sch.cpp:156
 msgid "Place the component"
 msgstr "Placer le Composant"
 
@@ -7413,7 +6819,6 @@ msgid "&Power port"
 msgstr "Power Symbole"
 
 #: eeschema/menubar.cpp:212
-#: eeschema/tool_sch.cpp:160
 msgid "Place the power port"
 msgstr "Placer le Symbole Power"
 
@@ -7422,7 +6827,6 @@ msgid "&Wire"
 msgstr "&Fil"
 
 #: eeschema/menubar.cpp:218
-#: eeschema/tool_sch.cpp:165
 msgid "Place the wire"
 msgstr "Place fil"
 
@@ -7475,7 +6879,6 @@ msgid "Place a global label. Warning: all global labels with the same name are c
 msgstr "Placer un label global. Attention: tous les labels globaux avec le même nom sont connectés dans toute la hierarchie"
 
 #: eeschema/menubar.cpp:284
-#: eeschema/eelayer.h:85
 msgid "Junction"
 msgstr "Jonction"
 
@@ -7528,7 +6931,6 @@ msgid "Graphic text (comment)"
 msgstr "Ttextes graphiques (commentaires)"
 
 #: eeschema/menubar.cpp:349
-#: eeschema/tool_sch.cpp:223
 msgid "Place the graphic text (comment)"
 msgstr "Placer le textes graphique (commentaire)"
 
@@ -7537,7 +6939,6 @@ msgid "Setting colors..."
 msgstr "Choisir les couleurs d'affichage..."
 
 #: eeschema/menubar.cpp:371
-#: gerbview/tool_gerber.cpp:110
 msgid "&Options"
 msgstr "&Options"
 
@@ -7660,7 +7061,6 @@ msgstr "Trace  "
 
 #: eeschema/netlist_control.cpp:124
 #: eeschema/netlist_control.cpp:240
-#: gerbview/options.cpp:201
 msgid "Default format"
 msgstr "Format par défaut"
 
@@ -7714,7 +7114,6 @@ msgid "Netlist command:"
 msgstr "Commande netliste:"
 
 #: eeschema/netlist_control.cpp:320
-#: share/setpage.cpp:354
 msgid "Title:"
 msgstr "Titre:"
 
@@ -8034,37 +7433,30 @@ msgid "Copy to Clipboard"
 msgstr "Copie dans Presse papier"
 
 #: eeschema/pinedit.cpp:22
-#: eeschema/pinedit-dialog.cpp:251
 msgid "line"
 msgstr "Ligne"
 
 #: eeschema/pinedit.cpp:22
-#: eeschema/pinedit-dialog.cpp:252
 msgid "invert"
 msgstr "invert"
 
 #: eeschema/pinedit.cpp:22
-#: eeschema/pinedit-dialog.cpp:253
 msgid "clock"
 msgstr "clock"
 
 #: eeschema/pinedit.cpp:22
-#: eeschema/pinedit-dialog.cpp:254
 msgid "clock inv"
 msgstr "clock inv"
 
 #: eeschema/pinedit.cpp:23
-#: eeschema/pinedit-dialog.cpp:255
 msgid "low in"
 msgstr "low in"
 
 #: eeschema/pinedit.cpp:23
-#: eeschema/pinedit-dialog.cpp:256
 msgid "low clock"
 msgstr "low clock"
 
 #: eeschema/pinedit.cpp:23
-#: eeschema/pinedit-dialog.cpp:257
 msgid "low out"
 msgstr "low out"
 
@@ -8072,21 +7464,21 @@ msgstr "low out"
 msgid "Occupied by other pin. Continue?"
 msgstr "Occupé une autre pin, Continuer ?"
 
-#: eeschema/pinedit.cpp:1007
+#: eeschema/pinedit.cpp:1005
 #, 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:1013
+#: eeschema/pinedit.cpp:1011
 #, c-format
 msgid "  Part %d"
 msgstr "Composant %d"
 
-#: eeschema/pinedit.cpp:1019
+#: eeschema/pinedit.cpp:1017
 msgid "  Convert"
 msgstr "  Convert"
 
-#: eeschema/pinedit.cpp:1021
+#: eeschema/pinedit.cpp:1019
 msgid "  Normal"
 msgstr "  Normal"
 
@@ -8099,8 +7491,6 @@ msgid "B/W"
 msgstr "N/B"
 
 #: eeschema/plotps.cpp:204
-#: share/svg_print.cpp:212
-#: share/dialog_print.cpp:203
 msgid "Color"
 msgstr "Couleur"
 
@@ -8109,8 +7499,6 @@ msgid "Plot Color:"
 msgstr "Tracé et Couleurs:"
 
 #: eeschema/plotps.cpp:209
-#: share/svg_print.cpp:218
-#: share/dialog_print.cpp:194
 msgid "Print Sheet Ref"
 msgstr "Imprimer cartouche"
 
@@ -8124,8 +7512,6 @@ msgid "Plot: %s\n"
 msgstr "Trace: %s\n"
 
 #: eeschema/save_schemas.cpp:86
-#: eeschema/netform.cpp:60
-#: eeschema/netform.cpp:278
 msgid "Failed to create file "
 msgstr "Impossible de créer le fichier "
 
@@ -8187,7 +7573,6 @@ msgid "Select component (%d items)"
 msgstr "Selection composant (%d items)"
 
 #: eeschema/sheet.cpp:162
-#: share/svg_print.cpp:243
 msgid "Filename:"
 msgstr "Nom Fichier:"
 
@@ -8498,28 +7883,20 @@ msgid "Display next part"
 msgstr "Afficher composant suivant"
 
 #: eeschema/tool_viewlib.cpp:67
-#: cvpcb/displayframe.cpp:123
-#: 3d-viewer/3d_toolbar.cpp:43
 msgid "zoom + (F1)"
 msgstr "zoom + (F1)"
 
 #: eeschema/tool_viewlib.cpp:71
-#: cvpcb/displayframe.cpp:126
-#: 3d-viewer/3d_toolbar.cpp:46
 msgid "zoom - (F2)"
 msgstr "zoom - (F2)"
 
 #: eeschema/tool_viewlib.cpp:75
-#: cvpcb/displayframe.cpp:129
-#: 3d-viewer/3d_toolbar.cpp:49
 msgid "redraw (F3)"
 msgstr "Redessin (F3)"
 
 #: eeschema/tool_viewlib.cpp:79
-#: cvpcb/displayframe.cpp:132
-#: cvpcb/displayframe.cpp:136
-msgid "1:1 zoom"
-msgstr "1:1 zoom"
+msgid "best zoom"
+msgstr "Meilleur Zoom"
 
 #: eeschema/tool_viewlib.cpp:84
 msgid "Show as \"De Morgan\" normal part"
@@ -8593,7 +7970,6 @@ msgid "3 States"
 msgstr "3 Etats"
 
 #: eeschema/pinedit-dialog.cpp:269
-#: eeschema/component_wizard/ki_component_setup.cpp:224
 msgid "Unspecified"
 msgstr "Non specifié"
 
@@ -8778,13 +8154,15 @@ msgid "Cvpcb is already running, Continue?"
 msgstr "Cvpcb est est cours d'exécution. Continuer ?"
 
 #: cvpcb/displayframe.cpp:118
-#: pcbnew/dialog_display_options.h:54
-#: cvpcb/dialog_display_options.h:51
 msgid "Display Options"
 msgstr "Options d'Affichage"
 
+#: cvpcb/displayframe.cpp:132
+#: cvpcb/displayframe.cpp:136
+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"
@@ -8795,7 +8173,6 @@ msgid "Components: %d (free: %d)"
 msgstr "Composants: %d (libres: %d)"
 
 #: cvpcb/init.cpp:112
-#: cvpcb/cvframe.cpp:340
 #, c-format
 msgid "Componants: %d (free: %d)"
 msgstr "Composants: %d (libres: %d)"
@@ -9037,7 +8414,6 @@ msgid "Delete selections"
 msgstr "Effacement des associations existantes"
 
 #: cvpcb/cvframe.cpp:424
-#: share/drawframe.cpp:134
 msgid "font for dialog boxes"
 msgstr "fonte pour boites de dialogue"
 
@@ -9046,17 +8422,14 @@ msgid "font for Lists"
 msgstr "fonte pour listes"
 
 #: cvpcb/cvframe.cpp:428
-#: share/drawframe.cpp:138
 msgid "font for Status Line"
 msgstr "fonte pour Ligne d'état"
 
 #: cvpcb/cvframe.cpp:431
-#: share/drawframe.cpp:141
 msgid "&Font selection"
 msgstr "Sélection Fonte"
 
 #: cvpcb/cvframe.cpp:433
-#: share/drawframe.cpp:142
 msgid "Choose font type and size for dialogs, infos and status box"
 msgstr "Choisir les fontes et leur taille pour les dialogues, infos et ligne d'état"
 
@@ -9260,7 +8633,6 @@ msgid "You must choose a PDF viewer before use this option"
 msgstr "Vous devez choisir un Visualisateur PDF avant d'utiliser cette option"
 
 #: kicad/preferences.cpp:97
-#: common/gestfich.cpp:685
 msgid "Prefered Editor:"
 msgstr "Editeur préféré:"
 
@@ -9469,7 +8841,6 @@ msgid "Load file:"
 msgstr "Charger Fichiers:"
 
 #: gerbview/affiche.cpp:34
-#: gerbview/tool_gerber.cpp:310
 msgid "Layer "
 msgstr "Couche "
 
@@ -9523,7 +8894,6 @@ msgid "Gerber files:"
 msgstr "Fichiers Gerber:"
 
 #: gerbview/files.cpp:187
-#: gerbview/readgerb.cpp:273
 msgid "D codes files:"
 msgstr "Fichiers D-Codes:"
 
@@ -9532,7 +8902,6 @@ msgid "GerbView is already running. Continue?"
 msgstr "Gerbview est est cours d'exécution. Continuer ?"
 
 #: gerbview/gerbview_config.cpp:131
-#: gerbview/process_config.cpp:117
 msgid "Save config file"
 msgstr "Sauver config"
 
@@ -9868,66 +9237,6 @@ msgstr "Bloc Miroir"
 msgid "Infos:"
 msgstr "Infos:"
 
-#: common/edaappl.cpp:63
-msgid "Default"
-msgstr "Defaut"
-
-#: common/edaappl.cpp:76
-msgid "French"
-msgstr "French"
-
-#: common/edaappl.cpp:82
-msgid "Spanish"
-msgstr "Espagnol"
-
-#: common/edaappl.cpp:88
-msgid "Portuguese"
-msgstr "Portugais"
-
-#: common/edaappl.cpp:94
-msgid "Italian"
-msgstr "Italien"
-
-#: common/edaappl.cpp:100
-msgid "German"
-msgstr "Allemand"
-
-#: common/edaappl.cpp:106
-msgid "Slovenian"
-msgstr "Slovène"
-
-#: common/edaappl.cpp:112
-msgid "Hungarian"
-msgstr "Hongrois"
-
-#: common/edaappl.cpp:118
-msgid "Polish"
-msgstr "Polonais"
-
-#: common/edaappl.cpp:124
-msgid "Russian"
-msgstr "Russe"
-
-#: common/edaappl.cpp:130
-msgid "Korean"
-msgstr "Coréen"
-
-#: common/edaappl.cpp:136
-msgid "Chinese simplified"
-msgstr "Chinois Simplifié"
-
-#: common/edaappl.cpp:142
-msgid "Catalan"
-msgstr "Catalan"
-
-#: common/edaappl.cpp:148
-msgid "Dutch"
-msgstr "Hollandais"
-
-#: common/edaappl.cpp:597
-msgid "Language"
-msgstr "Langage"
-
 #: common/eda_doc.cpp:150
 msgid "Doc File "
 msgstr "Fichiers de Doc "
@@ -10196,6 +9505,70 @@ msgstr "BAD INDEX"
 msgid "Help file %s not found"
 msgstr "Fichier d'aide %s non trouvé"
 
+#: common/edaappl.cpp:63
+msgid "Default"
+msgstr "Defaut"
+
+#: common/edaappl.cpp:76
+msgid "French"
+msgstr "French"
+
+#: common/edaappl.cpp:82
+msgid "Spanish"
+msgstr "Espagnol"
+
+#: common/edaappl.cpp:88
+msgid "Portuguese"
+msgstr "Portugais"
+
+#: common/edaappl.cpp:94
+msgid "Italian"
+msgstr "Italien"
+
+#: common/edaappl.cpp:100
+msgid "German"
+msgstr "Allemand"
+
+#: common/edaappl.cpp:106
+msgid "Slovenian"
+msgstr "Slovène"
+
+#: common/edaappl.cpp:112
+msgid "Hungarian"
+msgstr "Hongrois"
+
+#: common/edaappl.cpp:118
+msgid "Polish"
+msgstr "Polonais"
+
+#: common/edaappl.cpp:124
+msgid "Czech"
+msgstr ""
+
+#: common/edaappl.cpp:130
+msgid "Russian"
+msgstr "Russe"
+
+#: common/edaappl.cpp:136
+msgid "Korean"
+msgstr "Coréen"
+
+#: common/edaappl.cpp:142
+msgid "Chinese simplified"
+msgstr "Chinois Simplifié"
+
+#: common/edaappl.cpp:148
+msgid "Catalan"
+msgstr "Catalan"
+
+#: common/edaappl.cpp:154
+msgid "Dutch"
+msgstr "Hollandais"
+
+#: common/edaappl.cpp:603
+msgid "Language"
+msgstr "Langage"
+
 #: 3d-viewer/3d_aux.cpp:207
 msgid "Vertex "
 msgstr "Vertex "
@@ -10620,7 +9993,6 @@ msgid "dialog_freeroute_exchange"
 msgstr "dialog_freeroute_exchange"
 
 #: pcbnew/dialog_general_options.h:60
-#: eeschema/dialog_options.h:55
 msgid "General Options"
 msgstr "Options Générales"
 
@@ -10637,7 +10009,6 @@ msgid "Footprints Orientation"
 msgstr "Orientation des Modules"
 
 #: pcbnew/dialog_setup_libs.h:43
-#: eeschema/dialog_eeschema_config.h:50
 msgid "Dialog"
 msgstr "Dialog"
 
diff --git a/pcbnew/gendrill.cpp b/pcbnew/gendrill.cpp
index bfb1dcc804..41d57d92bc 100644
--- a/pcbnew/gendrill.cpp
+++ b/pcbnew/gendrill.cpp
@@ -83,14 +83,14 @@ void WinEDA_DrillFrame::InitDisplayParams( void )
         m_Choice_Precision->Enable( false );
 
     msg = ReturnStringFromValue( g_UnitMetric,
-                                 g_DesignSettings.m_ViaDrill,
-                                 m_Parent->m_InternalUnits );
+        g_DesignSettings.m_ViaDrill,
+        m_Parent->m_InternalUnits );
     msg += ReturnUnitSymbol( g_UnitMetric );
     m_ViaDrillValue->SetLabel( msg );
 
     msg = ReturnStringFromValue( g_UnitMetric,
-                                 g_DesignSettings.m_MicroViaDrill,
-                                 m_Parent->m_InternalUnits );
+        g_DesignSettings.m_MicroViaDrill,
+        m_Parent->m_InternalUnits );
     msg += ReturnUnitSymbol( g_UnitMetric );
     m_MicroViaDrillValue->SetLabel( msg );
 
@@ -133,8 +133,8 @@ void WinEDA_DrillFrame::InitDisplayParams( void )
                     m_PadsHoleCount++;
             }
             else
-                if( MIN( pad->m_Drill.x, pad->m_Drill.y ) != 0 )
-                    m_PadsHoleCount++;
+            if( MIN( pad->m_Drill.x, pad->m_Drill.y ) != 0 )
+                m_PadsHoleCount++;
         }
     }
 
@@ -285,7 +285,7 @@ void WinEDA_DrillFrame::GenDrillFiles( wxCommandEvent& event )
     for( ; ; )
     {
         Build_Holes_List( m_Parent->m_Pcb, s_HoleListBuffer, s_ToolListBuffer,
-                          layer1, layer2, gen_through_holes ? false : true );
+            layer1, layer2, gen_through_holes ? false : true );
         if( s_ToolListBuffer.size() > 0 ) //holes?
         {
             FullFileName = m_Parent->GetScreen()->m_FileName;
@@ -305,14 +305,14 @@ void WinEDA_DrillFrame::GenDrillFiles( wxCommandEvent& event )
             ChangeFileNameExt( FullFileName, layer_extend );
 
             FullFileName = EDA_FileSelector( _( "Drill file" ),
-                                            wxEmptyString, /* Chemin par defaut */
-                                            FullFileName,  /* nom fichier par defaut */
-                                            Ext,           /* extension par defaut */
-                                            Mask,          /* Masque d'affichage */
-                                            this,
-                                            wxFD_SAVE,
-                                            TRUE
-                                            );
+                wxEmptyString,                              /* Chemin par defaut */
+                FullFileName,                               /* nom fichier par defaut */
+                Ext,                                        /* extension par defaut */
+                Mask,                                       /* Masque d'affichage */
+                this,
+                wxFD_SAVE,
+                TRUE
+            );
 
             if( FullFileName != wxEmptyString )
             {
@@ -408,7 +408,7 @@ int WinEDA_DrillFrame::Create_Drill_File_EXCELLON( std::vector<HOLE_INFO>&  aHol
     float xt, yt;
     char  line[1024];
 
-    SetLocaleTo_C_standard( ); // Use the standard notation for float numbers
+    SetLocaleTo_C_standard(); // Use the standard notation for float numbers
 
     Write_Excellon_Header( dest );
 
@@ -420,10 +420,10 @@ int WinEDA_DrillFrame::Create_Drill_File_EXCELLON( std::vector<HOLE_INFO>&  aHol
     {
         if( s_Unit_Drill_is_Inch )  /* does it need T01, T02 or is T1,T2 ok?*/
             sprintf( line, "T%dC%.3f\n", ii + 1,
-                     float (aToolListBuffer[ii].m_Diameter) * s_ConversionUnits );
+                float (aToolListBuffer[ii].m_Diameter) * s_ConversionUnits );
         else
             sprintf( line, "T%dC%.3f\n", ii + 1,
-                     float (aToolListBuffer[ii].m_Diameter) * s_ConversionUnits * 10.0 );
+                float (aToolListBuffer[ii].m_Diameter) * s_ConversionUnits * 10.0 );
 
         fputs( line, dest );
     }
@@ -539,7 +539,7 @@ int WinEDA_DrillFrame::Create_Drill_File_EXCELLON( std::vector<HOLE_INFO>&  aHol
 
     Write_End_Of_File_Drill( dest );
 
-    SetLocaleTo_Default( );  // Revert to locale float notation
+    SetLocaleTo_Default();  // Revert to locale float notation
 
     return holes_count;
 }
@@ -629,7 +629,7 @@ void WinEDA_DrillFrame::Write_Excellon_Header( FILE* aFile )
 /* Print the DRILL file header. The full header is:
  * M48
  * ;DRILL file {PCBNEW (2007-11-29-b)} date 17/1/2008-21:02:35
- * ;FORMAT={2:4 / absolute / Pouces / Suppression zeros de t�te}
+ * ;FORMAT={ <precision> / absolute / <units> / <numbers format>}
  * R,T
  * VER,1
  * FMAT,2
@@ -645,22 +645,43 @@ void WinEDA_DrillFrame::Write_Excellon_Header( FILE* aFile )
 
     if( !Minimal )
     {
+        int            ii = m_Choice_Zeros_Format->GetSelection();
         DateAndTime( Line );
+        // The next 2 lines in EXCELLON files are comments:
         wxString msg = g_Main_Title + wxT( " " ) + GetBuildVersion();
         fprintf( aFile, ";DRILL file {%s} date %s\n", CONV_TO_UTF8( msg ), Line );
         msg = wxT( ";FORMAT={" );
-        msg << m_Choice_Precision->GetStringSelection() <<  wxT("/ absolute / ");
-        msg << m_Choice_Unit->GetStringSelection() <<  wxT(" / ");
-        msg << m_Choice_Zeros_Format->GetStringSelection() << wxT("}\n");
+        // Print precision:
+        if ( ii > 0 )
+            msg << m_Choice_Precision->GetStringSelection();
+        else
+            msg << wxT("-.-");  // in decimal format the precision is irrelevant
+        msg << wxT( "/ absolute / " );
+        msg << ( s_Unit_Drill_is_Inch ? wxT( "inch" ) : wxT( "metric" ) );
+
+        /* Adding numbers notation format.
+         * this is same as m_Choice_Zeros_Format strings, but NOT translated
+         * because some EXCELLON parsers do not like non ascii values
+         * so we use ONLY english (ascii) strings.
+         * if new options are added in m_Choice_Zeros_Format, they must also be added here
+         */
+        msg << wxT( " / " );
+        const wxString zero_fmt[5] =
+        {
+            wxT( "decimal" ),          wxT( "suppress leading zeros" ),
+            wxT( "suppress trailing zeros" ), wxT( "keep zeros" ),
+            wxT( "???" )
+        };
+        if( ii < 0 || ii > 4 )
+            ii = 4;
+        msg << zero_fmt[ii];
+        msg << wxT( "}\n" );
         fputs( CONV_TO_UTF8( msg ), aFile );
 
         fputs( "R,T\nVER,1\nFMAT,2\n", aFile );
     }
 
-    if( s_Unit_Drill_is_Inch )
-        fputs( "INCH", aFile );     // Si unites en INCHES
-    else
-        fputs( "METRIC", aFile );   // Si unites en mm
+    fputs( s_Unit_Drill_is_Inch ? "INCH" : "METRIC", aFile );
 
     switch( s_Zeros_Format )
     {
@@ -726,14 +747,14 @@ void WinEDA_DrillFrame::GenDrillMap( const wxString aFileName,
     Mask += Ext;
 
     FullFileName = EDA_FileSelector( _( "Drill Map file" ),
-                                     wxEmptyString, /* Chemin par defaut */
-                                     FullFileName,  /* nom fichier par defaut */
-                                     Ext,           /* extension par defaut */
-                                     Mask,          /* Masque d'affichage */
-                                     this,
-                                     wxFD_SAVE,
-                                     TRUE
-                                     );
+        wxEmptyString,                              /* Chemin par defaut */
+        FullFileName,                               /* nom fichier par defaut */
+        Ext,                                        /* extension par defaut */
+        Mask,                                       /* Masque d'affichage */
+        this,
+        wxFD_SAVE,
+        TRUE
+    );
     if( FullFileName.IsEmpty() )
         return;
 
@@ -746,13 +767,13 @@ void WinEDA_DrillFrame::GenDrillMap( const wxString aFileName,
     }
 
     GenDrillMapFile( m_Parent->m_Pcb,
-                     dest,
-                     FullFileName,
-                     m_Parent->GetScreen()->m_CurrentSheetDesc->m_Size,
-                     s_HoleListBuffer,
-                     s_ToolListBuffer,
-                     s_Unit_Drill_is_Inch,
-                     format );
+        dest,
+        FullFileName,
+        m_Parent->GetScreen()->m_CurrentSheetDesc->m_Size,
+        s_HoleListBuffer,
+        s_ToolListBuffer,
+        s_Unit_Drill_is_Inch,
+        format );
 }
 
 
@@ -772,14 +793,14 @@ void WinEDA_DrillFrame::GenDrillReport( const wxString aFileName )
     Mask += Ext;
 
     FileName = EDA_FileSelector( _( "Drill Report file" ),
-                                 wxEmptyString, /* Chemin par defaut */
-                                 FileName,      /* nom fichier par defaut */
-                                 Ext,           /* extension par defaut */
-                                 Mask,          /* Masque d'affichage */
-                                 this,
-                                 wxFD_SAVE,
-                                 TRUE
-                                 );
+        wxEmptyString,                          /* Chemin par defaut */
+        FileName,                               /* nom fichier par defaut */
+        Ext,                                    /* extension par defaut */
+        Mask,                                   /* Masque d'affichage */
+        this,
+        wxFD_SAVE,
+        TRUE
+    );
     if( FileName.IsEmpty() )
         return;
 
@@ -791,8 +812,8 @@ void WinEDA_DrillFrame::GenDrillReport( const wxString aFileName )
         return;
     }
     GenDrillReportFile( dest, m_Parent->m_Pcb,
-                        m_Parent->GetScreen()->m_FileName,
-                        s_Unit_Drill_is_Inch,
-                        s_HoleListBuffer,
-                        s_ToolListBuffer );
+        m_Parent->GetScreen()->m_FileName,
+        s_Unit_Drill_is_Inch,
+        s_HoleListBuffer,
+        s_ToolListBuffer );
 }
diff --git a/pcbnew/tool_modedit.cpp b/pcbnew/tool_modedit.cpp
index 96b136702d..5203d5ff1d 100644
--- a/pcbnew/tool_modedit.cpp
+++ b/pcbnew/tool_modedit.cpp
@@ -112,10 +112,10 @@ void WinEDA_ModuleEditFrame::ReCreateHToolbar()
                          msg );
 
     msg = AddHotkeyName( _( "redraw" ), s_Module_Editor_Hokeys_Descr, HK_ZOOM_REDRAW );
-    m_HToolBar->AddTool( ID_ZOOM_REDRAW_BUTT, wxEmptyString, BITMAP( repaint_xpm ),
+    m_HToolBar->AddTool( ID_ZOOM_REDRAW_BUTT, wxEmptyString, BITMAP( zoom_redraw_xpm ),
                          msg );
 
-    m_HToolBar->AddTool( ID_ZOOM_PAGE_BUTT, wxEmptyString, BITMAP( zoom_optimal_xpm ),
+    m_HToolBar->AddTool( ID_ZOOM_PAGE_BUTT, wxEmptyString, BITMAP( zoom_auto_xpm ),
                         _( "auto zoom" ) );
 
     m_HToolBar->AddSeparator();
diff --git a/pcbnew/tool_pcb.cpp b/pcbnew/tool_pcb.cpp
index b383f68107..41325a1d20 100644
--- a/pcbnew/tool_pcb.cpp
+++ b/pcbnew/tool_pcb.cpp
@@ -261,10 +261,10 @@ void WinEDA_PcbFrame::ReCreateHToolbar()
                          msg );
 
     msg = AddHotkeyName( _( "redraw" ), s_Board_Editor_Hokeys_Descr, HK_ZOOM_REDRAW );
-    m_HToolBar->AddTool( ID_ZOOM_REDRAW_BUTT, wxEmptyString, BITMAP( repaint_xpm ),
+    m_HToolBar->AddTool( ID_ZOOM_REDRAW_BUTT, wxEmptyString, BITMAP( zoom_redraw_xpm ),
                          msg );
 
-    m_HToolBar->AddTool( ID_ZOOM_PAGE_BUTT, wxEmptyString, BITMAP( zoom_optimal_xpm ),
+    m_HToolBar->AddTool( ID_ZOOM_PAGE_BUTT, wxEmptyString, BITMAP( zoom_auto_xpm ),
                         _( "auto zoom" ) );
 
     m_HToolBar->AddSeparator();
diff --git a/share/zoom.cpp b/share/zoom.cpp
index 498df3db4b..6d01682738 100644
--- a/share/zoom.cpp
+++ b/share/zoom.cpp
@@ -365,8 +365,8 @@ void WinEDA_DrawPanel::AddMenuZoom( wxMenu* MasterMenu )
     ADD_MENUITEM_WITH_SUBMENU( MasterMenu, zoom_choice,
                                ID_POPUP_ZOOM_SELECT, _( "Zoom Select" ), zoom_select_xpm );
 
-    ADD_MENUITEM( MasterMenu, ID_POPUP_ZOOM_AUTO, _( "Auto" ), zoom_optimal_xpm );
-    ADD_MENUITEM( MasterMenu, ID_POPUP_ZOOM_REDRAW, _( "Redraw" ), repaint_xpm );
+    ADD_MENUITEM( MasterMenu, ID_POPUP_ZOOM_AUTO, _( "Auto" ), zoom_auto_xpm );
+    ADD_MENUITEM( MasterMenu, ID_POPUP_ZOOM_REDRAW, _( "Redraw" ), zoom_redraw_xpm );
 
     /* Create the basic zoom list: */
     zoom = GetScreen()->GetZoom();