Skip to content

K
kicad-source-mirror
Commit 2eaa28f0 authored by charras's avatar charras
Browse files
Options

Pcbnew: some enhancements

parent e5cbb935
Hide whitespace changes
Inline Side-by-side
Showing with 358 additions and 1016 deletions
CHANGELOG.txt
View file @ 2eaa28f0
......@@ -4,7 +4,7 @@ KiCad ChangeLog 2009
Please add newer entries at the top, list the date and your name with
email address.
2009-mar-16 UPDATE Jean-Pierre Charras <jean-pierre.charras@inpg.fr>
2009-mar-23 UPDATE Jean-Pierre Charras <jean-pierre.charras@inpg.fr>
================================================================================
++pcbnew:
in DRC: added test pads to holes.
......
common/gr_basic.cpp
View file @ 2eaa28f0
......@@ -364,19 +364,19 @@ void GRSetDrawMode( wxDC* DC, int draw_mode )
{
if( draw_mode & GR_OR )
#if defined(__WXMAC__) && wxMAC_USE_CORE_GRAPHICS
DC->SetLogicalFunction( wxCOPY );
#else
DC->SetLogicalFunction( wxOR );
#endif
else if( draw_mode & GR_XOR )
DC->SetLogicalFunction( wxXOR );
else if( draw_mode & GR_NXOR )
DC->SetLogicalFunction( wxEQUIV );
else
#if defined (__WXMAC__) && wxMAC_USE_CORE_GRAPHICS
DC->SetLogicalFunction( wxXOR );
#else
DC->SetLogicalFunction( wxEQUIV );
#endif
else
DC->SetLogicalFunction( wxCOPY );
}
......
include/build_version.h
View file @ 2eaa28f0
......@@ -3,7 +3,7 @@
#ifndef KICAD_BUILD_VERSION
#define KICAD_BUILD_VERSION
#define BUILD_VERSION wxT("(20090332-unstable)")
#define BUILD_VERSION wxT("(20090325-unstable)")
COMMON_GLOBL wxString g_BuildVersion
#ifdef EDA_BASE
......
include/pcbstruct.h
View file @ 2eaa28f0
......@@ -287,6 +287,12 @@ public:
bool DisplayPolarCood;
int DisplayZonesMode;
int DisplayNetNamesMode; /* 0 do not show netnames,
* 1 show netnames on pads
* 2 show netnames on tracks
* 3 show netnames on tracks and pads
*/
bool Show_Modules_Cmp;
bool Show_Modules_Cu;
......
internat/fr/kicad.mo
View file @ 2eaa28f0
No preview for this file type
internat/fr/kicad.po
View file @ 2eaa28f0
......@@ -2,9 +2,9 @@ msgid ""
msgstr ""
"Project-Id-Version: kicad\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-03-20 08:07+0100\n"
"PO-Revision-Date: 2009-03-20 10:34+0100\n"
"Last-Translator: jp charras <jean-pierre.charras@inpg.fr>\n"
"POT-Creation-Date: 2009-03-26 20:06+0100\n"
"PO-Revision-Date: 2009-03-26 20:10+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"
......@@ -23,26 +23,10 @@ msgstr ""
"X-Poedit-SearchPath-7: share\n"
#: pcbnew/plothpgl.cpp:68
#: pcbnew/gen_modules_placefile.cpp:147
#: pcbnew/gen_modules_placefile.cpp:163
#: pcbnew/gen_modules_placefile.cpp:331
#: pcbnew/librairi.cpp:306
#: pcbnew/librairi.cpp:452
#: pcbnew/librairi.cpp:604
#: pcbnew/librairi.cpp:807
#: pcbnew/files.cpp:363
#: pcbnew/export_gencad.cpp:86
#: eeschema/plotps.cpp:471
#: eeschema/plothpgl.cpp:678
#: cvpcb/genequiv.cpp:45
#: gerbview/export_to_pcbnew.cpp:78
#: common/hotkeys_basic.cpp:389
msgid "Unable to create "
msgstr "Impossible de créer "
#: pcbnew/plothpgl.cpp:75
#: pcbnew/plotgerb.cpp:112
#: pcbnew/plotps.cpp:53
msgid "File"
msgstr "Fichier"
......@@ -59,72 +43,34 @@ msgid "PCB Text"
msgstr "Texte Pcb"
#: pcbnew/class_pcb_text.cpp:181
#: pcbnew/class_track.cpp:945
#: pcbnew/class_drawsegment.cpp:302
#: pcbnew/class_pad.cpp:554
#: pcbnew/dialog_print_using_printer.cpp:179
#: pcbnew/sel_layer.cpp:147
#: pcbnew/class_module.cpp:937
#: pcbnew/class_zone.cpp:904
#: pcbnew/dialog_edit_module.cpp:263
#: pcbnew/class_text_mod.cpp:496
msgid "Layer"
msgstr "Couche"
#: pcbnew/class_pcb_text.cpp:185
#: pcbnew/cotation.cpp:112
#: pcbnew/modedit_onclick.cpp:245
#: pcbnew/class_text_mod.cpp:502
#: pcbnew/dialog_print_using_printer_base.cpp:94
#: pcbnew/dialog_pcb_text_properties.cpp:165
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:54
msgid "Mirror"
msgstr "Miroir"
#: pcbnew/class_pcb_text.cpp:187
#: pcbnew/dialog_display_options_base.cpp:98
#: pcbnew/class_text_mod.cpp:486
#: eeschema/dialog_options.cpp:269
msgid "No"
msgstr "Non"
#: pcbnew/class_pcb_text.cpp:189
#: pcbnew/dialog_display_options_base.cpp:98
#: pcbnew/class_text_mod.cpp:488
#: eeschema/dialog_options.cpp:268
msgid "Yes"
msgstr "Oui"
#: pcbnew/class_pcb_text.cpp:192
#: pcbnew/class_pad.cpp:597
#: pcbnew/class_module.cpp:961
#: pcbnew/dialog_edit_module.cpp:274
#: pcbnew/class_text_mod.cpp:505
#: eeschema/affiche.cpp:118
msgid "Orient"
msgstr "Orient"
#: pcbnew/class_pcb_text.cpp:195
#: pcbnew/class_track.cpp:968
#: pcbnew/cotation.cpp:128
#: pcbnew/mirepcb.cpp:113
#: pcbnew/class_drawsegment.cpp:307
#: pcbnew/class_edge_mod.cpp:252
#: pcbnew/class_text_mod.cpp:508
#: pcbnew/dialog_pcb_text_properties.cpp:118
#: eeschema/dialog_cmp_graphic_properties.cpp:189
msgid "Width"
msgstr "Epaisseur"
#: pcbnew/class_pcb_text.cpp:198
#: pcbnew/class_pad.cpp:568
#: pcbnew/class_text_mod.cpp:511
msgid "H Size"
msgstr "Taille H"
#: pcbnew/class_pcb_text.cpp:201
#: pcbnew/class_pad.cpp:572
#: pcbnew/class_text_mod.cpp:514
msgid "V Size"
msgstr "Taille V"
......@@ -133,14 +79,11 @@ msgid "Read Config File"
msgstr "Lire Fichier Config"
#: pcbnew/pcbcfg.cpp:86
#: cvpcb/menucfg.cpp:168
#, c-format
msgid "File %s not found"
msgstr "Fichier %s non trouvé"
#: pcbnew/pcbcfg.cpp:211
#: eeschema/eeconfig.cpp:214
#: cvpcb/cfg.cpp:75
msgid "Save preferences"
msgstr "Sauver préférences"
......@@ -215,8 +158,6 @@ msgid "Component [%s]: footprint <%s> not found"
msgstr "Composant [%s]: Module <%s> non trouvé en librairie"
#: pcbnew/modules.cpp:83
#: pcbnew/librairi.cpp:527
#: common/get_component_dialog.cpp:99
msgid "Name:"
msgstr "Nom:"
......@@ -225,19 +166,15 @@ msgid "Search footprint"
msgstr "Cherche Module"
#: pcbnew/modules.cpp:311
#: pcbnew/onrightclick.cpp:740
msgid "Delete Module"
msgstr "Supprimer Module"
#: pcbnew/modules.cpp:312
#: eeschema/find.cpp:219
#: eeschema/onrightclick.cpp:306
msgid "Value "
msgstr "Valeur "
#: pcbnew/pcbplot.cpp:151
#: pcbnew/pcbplot.cpp:287
#: gerbview/tool_gerber.cpp:71
msgid "Plot"
msgstr "Tracer"
......@@ -294,7 +231,6 @@ msgid "X scale adjust"
msgstr "Ajustage Echelle X"
#: pcbnew/pcbplot.cpp:274
#: pcbnew/dialog_print_using_printer_base.cpp:57
msgid "Set X scale adjust for exact scale plotting"
msgstr "Ajuster échelle X pour traçage à l'échelle exacte"
......@@ -303,7 +239,6 @@ msgid "Y scale adjust"
msgstr "Ajustage Echelle Y"
#: pcbnew/pcbplot.cpp:279
#: pcbnew/dialog_print_using_printer_base.cpp:66
msgid "Set Y scale adjust for exact scale plotting"
msgstr "Ajuster échelle Y pour traçage à l'échelle exacte"
......@@ -320,13 +255,6 @@ msgid "Generate drill file"
msgstr "Créer Fichier de perçage"
#: pcbnew/pcbplot.cpp:299
#: pcbnew/xchgmod.cpp:140
#: pcbnew/dialog_netlist.cpp:232
#: pcbnew/dialog_print_using_printer_base.cpp:128
#: eeschema/dialog_build_BOM_base.cpp:137
#: eeschema/annotate_dialog.cpp:220
#: eeschema/dialog_print_using_printer_base.cpp:72
#: common/zoom.cpp:277
msgid "Close"
msgstr "Fermer"
......@@ -335,7 +263,6 @@ msgid "Exclude Edges_Pcb layer"
msgstr "Exclure Couche Contours PCB"
#: pcbnew/pcbplot.cpp:347
#: pcbnew/dialog_print_using_printer_base.cpp:37
msgid "Exclude contents of Edges_Pcb layer from all other layers"
msgstr "Exclure les tracés contour PCB des autres couches"
......@@ -420,12 +347,10 @@ msgid "Scale 1.5"
msgstr "Echelle 1,5"
#: pcbnew/pcbplot.cpp:421
#: pcbnew/dialog_print_using_printer_base.cpp:46
msgid "Scale 2"
msgstr "Echelle 2"
#: pcbnew/pcbplot.cpp:421
#: pcbnew/dialog_print_using_printer_base.cpp:46
msgid "Scale 3"
msgstr "Echelle 3"
......@@ -434,36 +359,14 @@ msgid "Scale Opt"
msgstr "Echelle"
#: pcbnew/pcbplot.cpp:430
#: pcbnew/class_board_item.cpp:23
#: pcbnew/dialog_display_options_base.cpp:48
#: pcbnew/dialog_display_options_base.cpp:54
#: pcbnew/dialog_display_options_base.cpp:92
#: pcbnew/dialog_non_copper_zones_properties_base.cpp:28
#: pcbnew/dialog_copper_zones_base.cpp:107
#: gerbview/options.cpp:335
msgid "Line"
msgstr "Ligne"
#: pcbnew/pcbplot.cpp:430
#: pcbnew/dialog_display_options_base.cpp:22
#: pcbnew/dialog_display_options_base.cpp:48
#: pcbnew/dialog_display_options_base.cpp:54
#: pcbnew/dialog_display_options_base.cpp:65
#: pcbnew/dialog_display_options_base.cpp:92
#: eeschema/dialog_cmp_graphic_properties.cpp:169
#: gerbview/options.cpp:312
#: gerbview/options.cpp:335
msgid "Filled"
msgstr "Plein"
#: pcbnew/pcbplot.cpp:430
#: pcbnew/dialog_display_options_base.cpp:22
#: pcbnew/dialog_display_options_base.cpp:48
#: pcbnew/dialog_display_options_base.cpp:54
#: pcbnew/dialog_display_options_base.cpp:65
#: pcbnew/dialog_display_options_base.cpp:92
#: gerbview/options.cpp:312
#: gerbview/options.cpp:335
msgid "Sketch"
msgstr "Contour"
......@@ -492,19 +395,14 @@ msgid "Draw origin ( 0,0 ) in sheet center"
msgstr "Origine des tracés au centre de la feuille"
#: pcbnew/pcbplot.cpp:701
#: pcbnew/dialog_print_using_printer.cpp:650
msgid "Warning: Scale option set to a very small value"
msgstr "Attention: option d'échelle ajustée à une valeur très petite"
#: pcbnew/pcbplot.cpp:703
#: pcbnew/dialog_print_using_printer.cpp:646
msgid "Warning: Scale option set to a very large value"
msgstr "Attention: option d'échelle ajustée à une valeur très grande"
#: pcbnew/pcbplot.cpp:738
#: pcbnew/dialog_print_using_printer.cpp:417
#: pcbnew/dialog_print_using_printer.cpp:457
#: gerbview/edit.cpp:244
msgid "No layer selected"
msgstr "Pas de couche sélectionnée"
......@@ -597,10 +495,6 @@ msgid "Merge"
msgstr "Fusionner"
#: pcbnew/clean.cpp:508
#: pcbnew/dialog_pad_properties_base.cpp:64
#: eeschema/dialog_erc.cpp:193
#: eeschema/dialog_erc.cpp:197
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:39
msgid "0"
msgstr "0"
......@@ -641,7 +535,6 @@ msgid "Pcbnew is already running, Continue?"
msgstr "Pcbnew est en cours d'exécution. Continuer ?"
#: pcbnew/editmod.cpp:47
#: pcbnew/edit.cpp:183
msgid "Module Editor"
msgstr "Ouvrir Editeur de modules"
......@@ -658,7 +551,6 @@ msgid "Error: Unexpected end of file !"
msgstr "Erreur: Fin de fichier inattendue !"
#: pcbnew/modedit.cpp:78
#: pcbnew/controle.cpp:172
msgid "Selection Clarification"
msgstr "Clarification de la Sélection"
......@@ -691,30 +583,22 @@ msgid "Add Pad"
msgstr "Ajouter Pastilles"
#: pcbnew/modedit.cpp:397
#: pcbnew/menubarmodedit.cpp:45
#: pcbnew/tool_modedit.cpp:127
msgid "Pad Settings"
msgstr "Caract pads"
#: pcbnew/modedit.cpp:407
#: eeschema/schedit.cpp:200
msgid "Add Drawing"
msgstr "Ajout d'éléments graphiques"
#: pcbnew/modedit.cpp:411
#: pcbnew/tool_modedit.cpp:180
msgid "Place anchor"
msgstr "Place Ancre"
#: pcbnew/modedit.cpp:425
#: pcbnew/edit.cpp:599
#: eeschema/libframe.cpp:582
#: eeschema/schedit.cpp:370
msgid "Delete item"
msgstr "Suppression d'éléments"
#: pcbnew/class_drc_item.cpp:39
#: pcbnew/dialog_drc.cpp:486
msgid "Unconnected pads"
msgstr "Pads non connectés"
......@@ -774,33 +658,31 @@ msgstr "Les zones de cuivre se coupent ou sont trop proches"
msgid "Copper area has a non existent net name"
msgstr "La zone de cuivre a un nom de net non existant"
#: pcbnew/class_drc_item.cpp:77
msgid "Hole near pad"
msgstr "Trou près d'un pad"
#: pcbnew/class_drc_item.cpp:79
msgid "Hole near track"
msgstr "Trou près d'une piste"
#: pcbnew/class_board_item.cpp:24
#: pcbnew/dialog_pad_properties_base.cpp:44
msgid "Rect"
msgstr "Rect"
#: pcbnew/class_board_item.cpp:25
#: pcbnew/class_drawsegment.cpp:286
msgid "Arc"
msgstr "Arc"
#: pcbnew/class_board_item.cpp:26
#: pcbnew/class_track.cpp:906
#: pcbnew/class_drawsegment.cpp:282
#: pcbnew/dialog_pad_properties_base.cpp:44
#: pcbnew/dialog_pad_properties_base.cpp:53
msgid "Circle"
msgstr "Cercle"
#: pcbnew/class_board_item.cpp:59
#: pcbnew/class_pad.cpp:470
msgid "Net"
msgstr "Net"
#: pcbnew/class_board_item.cpp:64
#: eeschema/dialog_build_BOM_base.cpp:79
#: eeschema/edit_component_in_schematic.cpp:428
#: eeschema/class_libentry_fields.cpp:131
msgid "Footprint"
msgstr "Module"
......@@ -844,23 +726,10 @@ msgid "Pcb Text"
msgstr "Texte Pcb"
#: pcbnew/class_board_item.cpp:102
#: pcbnew/dialog_netlist.cpp:162
#: eeschema/onrightclick.cpp:309
#: eeschema/dialog_create_component.cpp:156
#: eeschema/edit_component_in_schematic.cpp:349
#: eeschema/class_libentry_fields.cpp:129
#: eeschema/eelayer.h:152
msgid "Reference"
msgstr "Référence"
#: pcbnew/class_board_item.cpp:106
#: pcbnew/class_edge_mod.cpp:242
#: pcbnew/class_text_mod.cpp:468
#: eeschema/edit_component_in_schematic.cpp:387
#: eeschema/dialog_edit_libentry_fields_in_lib.cpp:154
#: eeschema/class_libentry_fields.cpp:130
#: eeschema/dialog_edit_component_in_schematic.cpp:89
#: eeschema/eelayer.h:158
msgid "Value"
msgstr "Valeur"
......@@ -871,9 +740,6 @@ msgid " of "
msgstr " de "
#: pcbnew/class_board_item.cpp:111
#: pcbnew/class_text_mod.cpp:468
#: pcbnew/class_text_mod.cpp:477
#: eeschema/dialog_edit_label_base.cpp:22
msgid "Text"
msgstr "Texte"
......@@ -882,24 +748,19 @@ msgid "Graphic"
msgstr "Graphique"
#: pcbnew/class_board_item.cpp:129
#: pcbnew/pcbframe.cpp:510
#: pcbnew/class_track.cpp:864
msgid "Track"
msgstr "Piste"
#: pcbnew/class_board_item.cpp:136
#: pcbnew/class_board_item.cpp:207
#: pcbnew/dialog_copper_zones_base.cpp:199
msgid "Net:"
msgstr "Net:"
#: pcbnew/class_board_item.cpp:141
#: pcbnew/class_zone.cpp:863
msgid "Zone Outline"
msgstr "Contour de Zone"
#: pcbnew/class_board_item.cpp:146
#: pcbnew/class_zone.cpp:867
msgid "(Cutout)"
msgstr "(Cutout)"
......@@ -908,17 +769,14 @@ msgid "Not on copper layer"
msgstr "Pas sur Couches Cuivre"
#: pcbnew/class_board_item.cpp:169
#: pcbnew/class_zone.cpp:889
msgid "Not Found"
msgstr " Non Trouvé"
#: pcbnew/class_board_item.cpp:175
#: pcbnew/class_track.cpp:868
msgid "Zone"
msgstr "Zone"
#: pcbnew/class_board_item.cpp:193
#: pcbnew/pcbframe.cpp:542
msgid "Via"
msgstr "Via"
......@@ -927,12 +785,10 @@ msgid "Blind/Buried"
msgstr "Borgne/Aveugle"
#: pcbnew/class_board_item.cpp:199
#: pcbnew/pcbnew.h:286
msgid "Micro Via"
msgstr "Micro Via"
#: pcbnew/class_board_item.cpp:222
#: pcbnew/class_marker.cpp:134
msgid "Marker"
msgstr "Marqueur"
......@@ -959,39 +815,10 @@ msgid "No Change"
msgstr "Garder"
#: pcbnew/swap_layers.cpp:225
#: pcbnew/set_grid.cpp:178
#: pcbnew/dialog_graphic_items_options.cpp:263
#: pcbnew/dialog_initpcb.cpp:161
#: pcbnew/dialog_drc.cpp:552
#: eeschema/dialog_cmp_graphic_properties.cpp:178
#: eeschema/pinedit-dialog.cpp:232
#: eeschema/dialog_edit_component_in_lib.cpp:218
#: eeschema/sheet.cpp:190
#: eeschema/dialog_create_component.cpp:187
#: eeschema/dialog_options.cpp:277
#: cvpcb/dialog_cvpcb_config.cpp:138
#: cvpcb/dialog_display_options.cpp:178
#: gerbview/select_layers_to_pcb.cpp:285
#: share/setpage.cpp:437
msgid "&OK"
msgstr "&OK"
#: pcbnew/swap_layers.cpp:229
#: pcbnew/set_grid.cpp:183
#: pcbnew/dialog_graphic_items_options.cpp:267
#: pcbnew/dialog_initpcb.cpp:164
#: pcbnew/dialog_drc.cpp:548
#: eeschema/dialog_cmp_graphic_properties.cpp:183
#: eeschema/pinedit-dialog.cpp:228
#: eeschema/dialog_edit_component_in_lib.cpp:214
#: eeschema/netlist_control.cpp:151
#: eeschema/netlist_control.cpp:281
#: eeschema/sheet.cpp:186
#: eeschema/dialog_create_component.cpp:192
#: eeschema/dialog_options.cpp:282
#: cvpcb/dialog_display_options.cpp:183
#: gerbview/select_layers_to_pcb.cpp:289
#: share/setpage.cpp:441
msgid "&Cancel"
msgstr "&Annuler"
......@@ -1043,7 +870,6 @@ msgid "<%s> Not Found"
msgstr "<%s> Non trouvé"
#: pcbnew/find.cpp:240
#: eeschema/dialog_find.cpp:117
msgid "Item to find:"
msgstr "Elément à chercher:"
......@@ -1089,9 +915,6 @@ msgid "Board modified, Save before exit ?"
msgstr "Circuit Imprimé modifié, Sauver avant de quitter ?"
#: pcbnew/pcbframe.cpp:324
#: eeschema/schframe.cpp:316
#: cvpcb/cvframe.cpp:216
#: common/confirm.cpp:119
msgid "Confirmation"
msgstr "Confirmation"
......@@ -1112,12 +935,10 @@ msgid "Display Polar Coords"
msgstr "Affichage coord Polaires"
#: pcbnew/pcbframe.cpp:450
#: eeschema/schframe.cpp:415
msgid "Grid not show"
msgstr "Grille non montrée"
#: pcbnew/pcbframe.cpp:450
#: eeschema/schframe.cpp:415
msgid "Show Grid"
msgstr "Afficher grille"
......@@ -1166,79 +987,59 @@ msgid "Normal Contrast Mode Display"
msgstr "Mode d'affichage Contraste normal"
#: pcbnew/pcbframe.cpp:497
#: pcbnew/tool_pcb.cpp:374
msgid "Hight Contrast Mode Display"
msgstr "Mode d'affichage Haut Contraste"
#: pcbnew/pcbframe.cpp:614
#: pcbnew/moduleframe.cpp:392
#: cvpcb/displayframe.cpp:323
msgid "3D Frame already opened"
msgstr "Fenêtre 3D déjà ouverte"
#: pcbnew/pcbframe.cpp:618
#: pcbnew/moduleframe.cpp:396
#: cvpcb/displayframe.cpp:327
msgid "3D Viewer"
msgstr "Visu 3D"
#: pcbnew/class_track.cpp:876
#: pcbnew/class_drawsegment.cpp:277
#: pcbnew/class_zone.cpp:870
#: pcbnew/class_marker.cpp:134
#: pcbnew/class_text_mod.cpp:483
#: pcbnew/class_track.cpp:881
msgid "Type"
msgstr "Type"
#: pcbnew/class_track.cpp:893
#: pcbnew/zones_by_polygon.cpp:899
#: pcbnew/class_zone.cpp:892
#: pcbnew/class_track.cpp:898
msgid "NetName"
msgstr "NetName"
#: pcbnew/class_track.cpp:899
#: pcbnew/class_zone.cpp:900
#: pcbnew/class_track.cpp:904
msgid "NetCode"
msgstr "NetCode"
#: pcbnew/class_track.cpp:904
#: pcbnew/class_drawsegment.cpp:292
#: pcbnew/class_track.cpp:909
msgid "Segment"
msgstr "Segment"
#: pcbnew/class_track.cpp:908
#: pcbnew/dialog_pad_properties_base.cpp:80
#: pcbnew/class_track.cpp:913
msgid "Standard"
msgstr "Standard"
#: pcbnew/class_track.cpp:916
#: pcbnew/class_track.cpp:921
msgid "Flags"
msgstr "Flags"
#: pcbnew/class_track.cpp:929
#: pcbnew/class_module.cpp:957
#: pcbnew/class_track.cpp:934
msgid "Stat"
msgstr "Stat"
#: pcbnew/class_track.cpp:953
#: pcbnew/class_track.cpp:958
msgid "Diam"
msgstr "Diam"
#: pcbnew/class_track.cpp:960
#: pcbnew/class_track.cpp:965
#: pcbnew/class_pad.cpp:578
#: pcbnew/class_track.cpp:970
msgid "Drill"
msgstr "Perçage"
#: pcbnew/dialog_SVG_print.cpp:206
#: eeschema/dialog_SVG_print.cpp:171
#: eeschema/dialog_SVG_print.cpp:190
msgid "Create file "
msgstr "Créer Fichier "
#: pcbnew/dialog_SVG_print.cpp:208
#: eeschema/dialog_SVG_print.cpp:173
#: eeschema/dialog_SVG_print.cpp:192
msgid " error"
msgstr " erreur"
......@@ -1264,18 +1065,14 @@ msgstr "Fichier de perçage"
#: pcbnew/gendrill.cpp:326
#: pcbnew/gendrill.cpp:814
#: pcbnew/plotps.cpp:46
#: pcbnew/xchgmod.cpp:640
msgid "Unable to create file "
msgstr "Impossible de créer le fichier "
#: pcbnew/gendrill.cpp:382
#: pcbnew/dialog_gendrill.cpp:184
msgid "2:3"
msgstr "2:3"
#: pcbnew/gendrill.cpp:383
#: pcbnew/dialog_gendrill.cpp:185
msgid "2:4"
msgstr "2:4"
......@@ -1305,7 +1102,6 @@ msgstr "Longueur (pouces):"
#: pcbnew/muonde.cpp:237
#: pcbnew/muonde.cpp:243
#: eeschema/affiche.cpp:97
msgid "Length"
msgstr "Longueur"
......@@ -1345,7 +1141,6 @@ msgid "Arc Stub"
msgstr "Arc Stub"
#: pcbnew/muonde.cpp:695
#: common/common.cpp:150
msgid " (mm):"
msgstr " (mm):"
......@@ -1367,74 +1162,10 @@ msgid "Complex shape"
msgstr "Forme complexe"
#: pcbnew/muonde.cpp:866
#: pcbnew/block.cpp:160
#: pcbnew/cotation.cpp:104
#: pcbnew/dialog_display_options_base.cpp:109
#: pcbnew/mirepcb.cpp:99
#: pcbnew/dialog_track_options_base.cpp:132
#: pcbnew/sel_layer.cpp:160
#: pcbnew/sel_layer.cpp:319
#: pcbnew/dialog_gendrill.cpp:292
#: pcbnew/set_color.cpp:342
#: pcbnew/dialog_non_copper_zones_properties_base.cpp:43
#: pcbnew/dialog_edit_module.cpp:119
#: pcbnew/dialog_orient_footprints.cpp:164
#: pcbnew/dialog_edit_module_text_base.cpp:105
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:144
#: pcbnew/dialog_pcb_text_properties.cpp:99
#: eeschema/eelayer.cpp:239
#: eeschema/dialog_edit_label_base.cpp:69
#: eeschema/sheetlab.cpp:95
#: eeschema/dialog_bodygraphictext_properties_base.cpp:71
#: gerbview/options.cpp:172
#: gerbview/options.cpp:303
#: gerbview/reglage.cpp:107
#: gerbview/set_color.cpp:315
#: common/displlst.cpp:106
#: common/get_component_dialog.cpp:113
msgid "OK"
msgstr "OK"
#: pcbnew/muonde.cpp:870
#: pcbnew/block.cpp:157
#: pcbnew/cotation.cpp:108
#: pcbnew/dialog_display_options_base.cpp:114
#: pcbnew/mirepcb.cpp:103
#: pcbnew/globaleditpad.cpp:110
#: pcbnew/dialog_track_options_base.cpp:138
#: pcbnew/onrightclick.cpp:123
#: pcbnew/onrightclick.cpp:137
#: pcbnew/sel_layer.cpp:164
#: pcbnew/sel_layer.cpp:323
#: pcbnew/dialog_gendrill.cpp:297
#: pcbnew/set_color.cpp:346
#: pcbnew/modedit_onclick.cpp:194
#: pcbnew/modedit_onclick.cpp:226
#: pcbnew/dialog_non_copper_zones_properties_base.cpp:47
#: pcbnew/dialog_copper_zones_base.cpp:162
#: pcbnew/dialog_edit_module.cpp:123
#: pcbnew/dialog_pad_properties_base.cpp:97
#: pcbnew/dialog_orient_footprints.cpp:167
#: pcbnew/dialog_edit_module_text_base.cpp:111
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:150
#: pcbnew/dialog_pcb_text_properties.cpp:104
#: eeschema/eelayer.cpp:243
#: eeschema/dialog_edit_label_base.cpp:74
#: eeschema/onrightclick.cpp:100
#: eeschema/onrightclick.cpp:112
#: eeschema/libedit_onrightclick.cpp:42
#: eeschema/libedit_onrightclick.cpp:57
#: eeschema/sheetlab.cpp:99
#: eeschema/dialog_bodygraphictext_properties_base.cpp:74
#: gerbview/options.cpp:176
#: gerbview/options.cpp:307
#: gerbview/reglage.cpp:111
#: gerbview/set_color.cpp:319
#: gerbview/onrightclick.cpp:39
#: gerbview/onrightclick.cpp:58
#: common/selcolor.cpp:171
#: common/displlst.cpp:111
#: common/get_component_dialog.cpp:122
msgid "Cancel"
msgstr "Annuler"
......@@ -1443,20 +1174,6 @@ msgid "Read Shape Descr File..."
msgstr "Lire fichier de description de forme..."
#: pcbnew/muonde.cpp:878
#: pcbnew/cotation.cpp:112
#: pcbnew/dialog_edit_module.cpp:271
#: pcbnew/dialog_edit_module.cpp:317
#: pcbnew/dialog_edit_module_text_base.cpp:96
#: pcbnew/dialog_pcb_text_properties.cpp:165
#: pcbnew/dialog_pcb_text_properties.cpp:176
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:52
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:134
#: eeschema/dialog_edit_label_base.cpp:40
#: eeschema/onrightclick.cpp:295
#: eeschema/dialog_options.cpp:236
#: eeschema/dialog_bodygraphictext_properties_base.cpp:60
#: eeschema/dialog_edit_libentry_fields_in_lib_base.cpp:99
#: eeschema/component_wizard/component_setup_frame.cpp:50
msgid "Normal"
msgstr "Normal"
......@@ -1473,17 +1190,6 @@ msgid "Shape Option"
msgstr "Option Forme"
#: pcbnew/muonde.cpp:885
#: pcbnew/cotation.cpp:124
#: pcbnew/mirepcb.cpp:108
#: pcbnew/dialog_pcb_text_properties.cpp:114
#: eeschema/pinedit-dialog.cpp:198
#: eeschema/pinedit-dialog.cpp:204
#: eeschema/dialog_edit_label_base.cpp:59
#: eeschema/sheet.cpp:169
#: eeschema/sheet.cpp:175
#: eeschema/dialog_edit_libentry_fields_in_lib.cpp:157
#: eeschema/dialog_edit_component_in_schematic.cpp:92
#: common/wxwineda.cpp:104
msgid "Size"
msgstr "Taille "
......@@ -1549,10 +1255,6 @@ msgid "Add Graphic"
msgstr "Addition éléments graphiques"
#: pcbnew/edit.cpp:293
#: pcbnew/tool_modedit.cpp:175
#: eeschema/libframe.cpp:506
#: eeschema/schedit.cpp:220
#: gerbview/tool_gerber.cpp:344
msgid "Add Text"
msgstr "Ajout de Texte"
......@@ -1621,7 +1323,6 @@ msgid "Abort routing?"
msgstr "Arrêter le routage?"
#: pcbnew/automove.cpp:209
#: pcbnew/xchgmod.cpp:615
msgid "No Modules!"
msgstr "Pas de Modules!"
......@@ -1646,14 +1347,10 @@ msgid "Net Code"
msgstr "Net Code"
#: pcbnew/affiche.cpp:53
#: pcbnew/menubarpcb.cpp:233
#: pcbnew/class_module.cpp:949
#: pcbnew/class_board.cpp:530
msgid "Pads"
msgstr "Pads"
#: pcbnew/affiche.cpp:67
#: pcbnew/class_board.cpp:540
msgid "Vias"
msgstr "Vias"
......@@ -1686,9 +1383,6 @@ msgid "Include board outline layer"
msgstr "Inclure couche contour pcb"
#: pcbnew/block.cpp:453
#: pcbnew/onrightclick.cpp:464
#: eeschema/onrightclick.cpp:632
#: eeschema/libedit_onrightclick.cpp:247
msgid "Delete Block"
msgstr "Effacer Bloc"
......@@ -1697,7 +1391,6 @@ msgid "Delete zones"
msgstr "SuppressionZones"
#: pcbnew/block.cpp:605
#: pcbnew/onrightclick.cpp:462
msgid "Rotate Block"
msgstr "Rotation Bloc"
......@@ -1714,9 +1407,6 @@ msgid "Move Block"
msgstr "Déplacer Bloc"
#: pcbnew/block.cpp:1099
#: pcbnew/onrightclick.cpp:458
#: eeschema/onrightclick.cpp:628
#: eeschema/libedit_onrightclick.cpp:244
msgid "Copy Block"
msgstr "Copie Bloc"
......@@ -1725,30 +1415,18 @@ msgid "Dimension properties"
msgstr "Propriétés des Cotes"
#: pcbnew/cotation.cpp:113
#: pcbnew/class_text_mod.cpp:489
#: pcbnew/dialog_edit_module_text_base.cpp:87
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:22
#: pcbnew/dialog_pcb_text_properties.cpp:166
#: eeschema/affiche.cpp:93
#: gerbview/options.cpp:184
#: gerbview/tool_gerber.cpp:89
msgid "Display"
msgstr "Affichage"
#: pcbnew/cotation.cpp:132
#: pcbnew/dialog_copper_zones_base.cpp:206
msgid "Layer:"
msgstr "Couche:"
#: pcbnew/set_grid.cpp:154
#: pcbnew/dialog_gendrill.cpp:167
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:30
#: gerbview/options.cpp:195
msgid "Inches"
msgstr "Pouces"
#: pcbnew/set_grid.cpp:155
#: common/drawframe.cpp:366
msgid "mm"
msgstr "mm"
......@@ -1772,80 +1450,121 @@ msgstr "Pistes et vias:"
msgid "Tracks:"
msgstr "Pistes:"
#: pcbnew/dialog_display_options_base.cpp:28
#: pcbnew/dialog_display_options_base.cpp:34
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:128
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:136
#: pcbnew/dialog_display_options_base.cpp:26
msgid "Select how tracks are displayed"
msgstr "Sélectionner comment les pistes sont affichées"
#: pcbnew/dialog_display_options_base.cpp:30
#: pcbnew/dialog_display_options_base.cpp:38
msgid "Always"
msgstr "Toujours"
#: pcbnew/dialog_display_options_base.cpp:28
#: pcbnew/dialog_display_options_base.cpp:30
msgid "New track"
msgstr "Nouvelle piste"
#: pcbnew/dialog_display_options_base.cpp:28
#: pcbnew/dialog_display_options_base.cpp:34
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:128
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:136
#: pcbnew/dialog_display_options_base.cpp:30
#: pcbnew/dialog_display_options_base.cpp:38
msgid "Never"
msgstr "Jamais"
#: pcbnew/dialog_display_options_base.cpp:30
#: pcbnew/dialog_display_options_base.cpp:32
msgid "Show Tracks Clearance:"
msgstr "Montrer Isolation Piste:"
#: pcbnew/dialog_display_options_base.cpp:34
msgid "defined holes"
msgstr "Trous définis"
msgid ""
"Show( or not) tracks clearance area.\n"
"If New track is selected, track clearance area is shown only when creating the track."
msgstr ""
"Monter (ou non) la zone d'isolation des pistes.\n"
"Si Nouvelle Piste est sélectionné, la zone d'isolation de la piste est montrée seulement pendant sa création."
#: pcbnew/dialog_display_options_base.cpp:36
#: pcbnew/dialog_display_options_base.cpp:38
msgid "Defined Holes"
msgstr "Trous Définis"
#: pcbnew/dialog_display_options_base.cpp:40
msgid "Show Via Holes:"
msgstr "Montrer trous des vias:"
#: pcbnew/dialog_display_options_base.cpp:43
#: pcbnew/dialog_display_options_base.cpp:42
msgid ""
"Show (or not) via holes.\n"
"If Defined Holes is selected, only the non default size holes are shown"
msgstr ""
"Montrer (ou non) le perçage des vias.\n"
"Si Trours Définis est sélectionné, seuls les trous à la valeur non défaut sont montrés"
#: pcbnew/dialog_display_options_base.cpp:49
msgid "Net Names:"
msgstr "Nom Equipots:"
#: pcbnew/dialog_display_options_base.cpp:51
msgid "Do Not Show"
msgstr "Ne Pas Montrer"
#: pcbnew/dialog_display_options_base.cpp:51
msgid "On Pads"
msgstr "Sur Pads"
#: pcbnew/dialog_display_options_base.cpp:51
msgid "OnTracks"
msgstr "Sur Pistes"
#: pcbnew/dialog_display_options_base.cpp:51
msgid "On Pads and Tracks"
msgstr "Sur Pads et Pistes"
#: pcbnew/dialog_display_options_base.cpp:53
msgid "Show Net Names:"
msgstr "Montrer Noms d'Equipotentielles:"
#: pcbnew/dialog_display_options_base.cpp:55
msgid "Show or not net names on pads and/or tracks"
msgstr "Montrer ou non les noms d'équipotentielles sur les pads et/ou sur les pistes"
#: pcbnew/dialog_display_options_base.cpp:62
msgid "Footprints:"
msgstr "Modules:"
#: pcbnew/dialog_display_options_base.cpp:50
#: pcbnew/dialog_display_options_base.cpp:69
msgid "Module Edges:"
msgstr "Contours modules:"
#: pcbnew/dialog_display_options_base.cpp:56
#: cvpcb/dialog_display_options.cpp:150
#: pcbnew/dialog_display_options_base.cpp:75
msgid "Texts:"
msgstr "Textes:"
#: pcbnew/dialog_display_options_base.cpp:63
#: pcbnew/dialog_display_options_base.cpp:82
msgid "Pad Options:"
msgstr "Options Pads:"
#: pcbnew/dialog_display_options_base.cpp:67
#: pcbnew/dialog_display_options_base.cpp:86
msgid "Pad Shapes:"
msgstr "Forme Pads:"
#: pcbnew/dialog_display_options_base.cpp:71
#: pcbnew/dialog_display_options_base.cpp:90
msgid "Show Pad Clearance"
msgstr "Montrer Isolation"
#: pcbnew/dialog_display_options_base.cpp:74
#: pcbnew/dialog_display_options_base.cpp:94
msgid "Show Pad Number"
msgstr "Afficher le n° de pad"
#: pcbnew/dialog_display_options_base.cpp:78
#: pcbnew/dialog_display_options_base.cpp:99
msgid "Show Pad NoConnect"
msgstr "Montrer non conn"
#: pcbnew/dialog_display_options_base.cpp:90
#: pcbnew/dialog_display_options_base.cpp:112
msgid "Others:"
msgstr "Autres:"
#: pcbnew/dialog_display_options_base.cpp:94
#: gerbview/options.cpp:336
#: pcbnew/dialog_display_options_base.cpp:116
msgid "Display other items:"
msgstr "Afficher autres éléments"
#: pcbnew/dialog_display_options_base.cpp:100
#: eeschema/dialog_options.cpp:270
#: pcbnew/dialog_display_options_base.cpp:122
msgid "Show page limits"
msgstr " Afficher limites de page"
......@@ -1954,17 +1673,10 @@ msgid "Delete Layer "
msgstr "Effacer Couche"
#: pcbnew/dialog_drc.cpp:432
#: pcbnew/dialog_netlist.cpp:193
#: eeschema/dialog_erc.cpp:239
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:23
#: eeschema/dialog_edit_component_in_lib.cpp:166
#: eeschema/dialog_create_component.cpp:168
#: eeschema/dialog_edit_libentry_fields_in_lib_base.cpp:49
msgid "Options"
msgstr "Options"
#: pcbnew/dialog_drc.cpp:442
#: pcbnew/dialog_track_options_base.cpp:106
msgid "Clearance"
msgstr "Isolation"
......@@ -2005,7 +1717,6 @@ msgid "Include tests for clearances between pad to pads"
msgstr "Inclure test de l'isolation entre pads"
#: pcbnew/dialog_drc.cpp:480
#: pcbnew/onrightclick.cpp:650
msgid "Zones"
msgstr "Zones"
......@@ -2133,7 +1844,6 @@ msgid "Current Value"
msgstr "Valeur courante"
#: pcbnew/xchgmod.cpp:159
#: pcbnew/tool_modedit.cpp:60
msgid "New Module"
msgstr "Nouveau Module"
......@@ -2175,7 +1885,6 @@ msgid "Place module"
msgstr "Place module"
#: pcbnew/loadcmp.cpp:209
#: eeschema/eelibs_read_libraryfiles.cpp:67
#, c-format
msgid "Library <%s> not found"
msgstr "Librairie %s non trouvée"
......@@ -2195,13 +1904,10 @@ msgid "Module <%s> not found"
msgstr "Module <%s> non trouvé"
#: pcbnew/loadcmp.cpp:355
#: pcbnew/librairi.cpp:254
#: eeschema/eelibs_read_libraryfiles.cpp:147
msgid "Library "
msgstr "Librairie "
#: pcbnew/loadcmp.cpp:355
#: eeschema/eelibs_read_libraryfiles.cpp:151
msgid " loaded"
msgstr " chargé"
......@@ -2347,10 +2053,6 @@ msgid "Unknown Pad shape"
msgstr "Forme Pad inconnue"
#: pcbnew/class_pad.cpp:464
#: pcbnew/class_edge_mod.cpp:241
#: pcbnew/class_module.cpp:964
#: pcbnew/class_text_mod.cpp:474
#: cvpcb/setvisu.cpp:33
msgid "Module"
msgstr "Module"
......@@ -2435,8 +2137,6 @@ msgid "Save current board as.."
msgstr "Sauver le Circuit Imprimé courant sous.."
#: pcbnew/menubarpcb.cpp:76
#: eeschema/menubar.cpp:71
#: gerbview/tool_gerber.cpp:70
msgid "P&rint"
msgstr "Imp&rimer"
......@@ -2453,7 +2153,6 @@ msgid "Plot pcb board in SVG format"
msgstr "Tracer le circuit imprimé en format SVG"
#: pcbnew/menubarpcb.cpp:87
#: eeschema/menubar.cpp:104
msgid "&Plot"
msgstr "&Tracer"
......@@ -2502,7 +2201,6 @@ msgid "Import a routed \"Specctra Session\" (*.ses) file"
msgstr "Importer un fichier de routage \"Specctra Session\" (*.ses) "
#: pcbnew/menubarpcb.cpp:135
#: eeschema/libframe.cpp:530
msgid "Import"
msgstr "Importer"
......@@ -2535,10 +2233,6 @@ msgid "Archive or add footprints in a library file"
msgstr "Archiver ou ajouter les modules dans un fichier librairie"
#: pcbnew/menubarpcb.cpp:161
#: eeschema/menubar.cpp:108
#: cvpcb/tool_cvpcb.cpp:125
#: kicad/buildmnu.cpp:162
#: gerbview/tool_gerber.cpp:75
msgid "E&xit"
msgstr "&Quitter"
......@@ -2547,7 +2241,6 @@ msgid "Quit PCBNEW"
msgstr "Quitter PCBNEW"
#: pcbnew/menubarpcb.cpp:172
#: eeschema/menubar.cpp:285
msgid "&Library"
msgstr "&Librairie"
......@@ -2556,14 +2249,12 @@ msgid "Setting libraries, directories and others..."
msgstr "Sélectionner les librairies , répertoires et autres"
#: pcbnew/menubarpcb.cpp:177
#: eeschema/menubar.cpp:290
#: gerbview/tool_gerber.cpp:83
msgid "&Colors"
msgstr "&Couleurs"
msgid "&Colors and Visibility"
msgstr "&Couleurs et Visibilité"
#: pcbnew/menubarpcb.cpp:178
msgid "Select colors and display for board items"
msgstr "Sélection couleurs et affichage des éléments du C.I."
msgid "Select colors and visibilty of layers and some items"
msgstr "Sélection les couleurs et l' affichage des couches et de certains éléments du C.I."
#: pcbnew/menubarpcb.cpp:182
msgid "&General"
......@@ -2578,16 +2269,14 @@ msgid "&Display"
msgstr "&Affichage"
#: pcbnew/menubarpcb.cpp:188
msgid "Select what items are displayed"
msgstr "Sélectionner les éléments à afficher"
msgid "Select how items (pads, tracks texts ... ) are displayed"
msgstr "Sélectionner comment les éléments (pads, pistes, textes ...) sont affichés"
#: pcbnew/menubarpcb.cpp:198
msgid "&Save Preferences"
msgstr "&Sauver Préférences"
#: pcbnew/menubarpcb.cpp:199
#: eeschema/menubar.cpp:308
#: gerbview/tool_gerber.cpp:100
msgid "Save application preferences"
msgstr "Sauver les préférences de l'application"
......@@ -2596,7 +2285,6 @@ msgid "&Read Preferences"
msgstr "&Lire Préférences"
#: pcbnew/menubarpcb.cpp:204
#: eeschema/menubar.cpp:313
msgid "Read application preferences"
msgstr "Lire les préférences de l'application"
......@@ -2609,26 +2297,18 @@ msgid "Adjust size and width for tracks and vias"
msgstr "Ajuster largeur des pistes et diamètre de vias"
#: pcbnew/menubarpcb.cpp:222
#: pcbnew/tool_pcb.cpp:614
#: eeschema/eelayer.cpp:211
#: pcbnew/set_color.h:414
#: eeschema/eelayer.h:214
#: gerbview/set_color.h:324
msgid "Grid"
msgstr "Grille"
#: pcbnew/menubarpcb.cpp:223
#: pcbnew/menubarmodedit.cpp:51
msgid "Adjust User Grid"
msgstr "Ajuster Grille utilisateur"
#: pcbnew/menubarpcb.cpp:228
#: pcbnew/dialog_graphic_items_options.h:47
msgid "Texts and Drawings"
msgstr "Textes et Tracés"
#: pcbnew/menubarpcb.cpp:229
#: pcbnew/menubarmodedit.cpp:41
msgid "Adjust width for texts and drawings"
msgstr "Ajuster dims pour textes et graphiques"
......@@ -2637,7 +2317,6 @@ msgid "Adjust size,shape,layers... for pads"
msgstr "Ajuster taille, forme, couches... pour pads"
#: pcbnew/menubarpcb.cpp:239
#: gerbview/tool_gerber.cpp:99
msgid "&Save Setup"
msgstr "&Sauver Options"
......@@ -2702,11 +2381,6 @@ msgid "Swap tracks on copper layers or drawings on others layers"
msgstr "Permutation de couches"
#: pcbnew/menubarpcb.cpp:298
#: pcbnew/menubarmodedit.cpp:64
#: eeschema/menubar.cpp:322
#: cvpcb/tool_cvpcb.cpp:154
#: kicad/buildmnu.cpp:257
#: gerbview/tool_gerber.cpp:129
msgid "&Contents"
msgstr "&Contenu"
......@@ -2723,40 +2397,26 @@ msgid "About PCBNEW printed circuit board designer"
msgstr "Au Sujet de PCBNEW outil de conception de C.I."
#: pcbnew/menubarpcb.cpp:313
#: pcbnew/menubarmodedit.cpp:82
msgid "3D Display"
msgstr "3D Visu"
#: pcbnew/menubarpcb.cpp:313
#: pcbnew/menubarmodedit.cpp:82
msgid "Show board in 3D viewer"
msgstr "Visualisation du circuit en 3D"
#: pcbnew/menubarpcb.cpp:317
#: eeschema/menubar.cpp:333
#: cvpcb/tool_cvpcb.cpp:164
#: kicad/buildmnu.cpp:269
#: gerbview/tool_gerber.cpp:135
#: 3d-viewer/3d_toolbar.cpp:116
msgid "&File"
msgstr "&Fichiers"
#: pcbnew/menubarpcb.cpp:318
#: eeschema/menubar.cpp:337
#: cvpcb/tool_cvpcb.cpp:165
#: kicad/buildmnu.cpp:271
#: gerbview/tool_gerber.cpp:136
#: 3d-viewer/3d_toolbar.cpp:124
msgid "&Preferences"
msgstr "&Préférences"
#: pcbnew/menubarpcb.cpp:319
#: pcbnew/menubarmodedit.cpp:86
msgid "&Dimensions"
msgstr "&Dimensions"
#: pcbnew/menubarpcb.cpp:320
#: gerbview/tool_gerber.cpp:137
msgid "&Miscellaneous"
msgstr "&Divers"
......@@ -2765,16 +2425,10 @@ msgid "P&ostprocess"
msgstr "P&ostprocesseurs"
#: pcbnew/menubarpcb.cpp:322
#: pcbnew/menubarmodedit.cpp:87
msgid "&3D Display"
msgstr "&3D Visu"
#: pcbnew/menubarpcb.cpp:323
#: pcbnew/menubarmodedit.cpp:88
#: eeschema/menubar.cpp:338
#: cvpcb/tool_cvpcb.cpp:166
#: kicad/buildmnu.cpp:272
#: gerbview/tool_gerber.cpp:140
msgid "&Help"
msgstr "&Aide"
......@@ -2795,7 +2449,6 @@ msgid "Delete draw items?"
msgstr "Suppression éléments graphiques?"
#: pcbnew/initpcb.cpp:256
#: gerbview/initpcb.cpp:136
msgid "Delete Tracks?"
msgstr "Effacer Pistes ?"
......@@ -2804,25 +2457,18 @@ msgid "Delete Modules?"
msgstr "Effacement des Modules?"
#: pcbnew/initpcb.cpp:300
#: gerbview/initpcb.cpp:159
msgid "Delete Pcb Texts"
msgstr "Effacer Textes Pcb"
#: pcbnew/dialog_print_using_printer.cpp:131
#: eeschema/dialog_print_using_printer.cpp:106
msgid "Error Init Printer info"
msgstr "Erreur Init info imprimante"
#: pcbnew/dialog_print_using_printer.cpp:166
#: pcbnew/dialog_SVG_print_base.cpp:23
#: pcbnew/dialog_pad_properties_base.cpp:106
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:53
#: pcbnew/dialog_print_using_printer_base.cpp:20
msgid "Layers:"
msgstr "Couches:"
#: pcbnew/dialog_print_using_printer.cpp:377
#: eeschema/dialog_print_using_printer.cpp:217
msgid "Printer Problem!"
msgstr "Problème d'imprimante"
......@@ -2831,20 +2477,14 @@ msgid "Print Preview"
msgstr "Prévisualisation"
#: pcbnew/dialog_print_using_printer.cpp:468
#: pcbnew/dialog_print_using_printer_base.cpp:125
#: eeschema/dialog_print_using_printer_base.cpp:69
#: pcbnew/dialog_print_using_printer_base.h:76
#: eeschema/dialog_print_using_printer_base.h:66
msgid "Print"
msgstr "Imprimer"
#: pcbnew/dialog_print_using_printer.cpp:479
#: eeschema/dialog_print_using_printer.cpp:289
msgid "There was a problem printing"
msgstr "Il y a un problème d'impression"
#: pcbnew/dialog_print_using_printer.cpp:495
#: eeschema/dialog_print_using_printer.cpp:305
#, c-format
msgid "Print page %d"
msgstr "Imprimer page %d"
......@@ -2870,8 +2510,6 @@ msgid "Import Module:"
msgstr "Importer Module:"
#: pcbnew/librairi.cpp:80
#: pcbnew/files.cpp:199
#: cvpcb/readschematicnetlist.cpp:112
#, c-format
msgid "File <%s> not found"
msgstr " fichier %s non trouvé"
......@@ -2895,7 +2533,6 @@ msgid "File %s exists, OK to replace ?"
msgstr "Fichier %s existant, OK pour remplacer ?"
#: pcbnew/librairi.cpp:201
#: eeschema/symbedit.cpp:178
#, c-format
msgid "Unable to create <%s>"
msgstr "Incapable de créer <%s>"
......@@ -2911,13 +2548,6 @@ msgid "Ok to delete module %s in library %s"
msgstr "Ok pour effacer module %s en librairie %s"
#: pcbnew/librairi.cpp:254
#: pcbnew/files.cpp:83
#: eeschema/find.cpp:240
#: eeschema/find.cpp:248
#: eeschema/find.cpp:688
#: gerbview/dcode.cpp:289
#: gerbview/readgerb.cpp:146
#: common/eda_doc.cpp:142
msgid " not found"
msgstr " non trouvé"
......@@ -3090,10 +2720,6 @@ msgid "The URL of the FreeRouting.net website"
msgstr "L' URL du site FreeRouting.net"
#: pcbnew/dialog_freeroute_exchange.cpp:213
#: pcbnew/dialog_netlist.cpp:253
#: eeschema/plotps.cpp:245
#: eeschema/dialog_erc.cpp:219
#: eeschema/plothpgl.cpp:339
msgid "&Close"
msgstr "&Fermer"
......@@ -3134,7 +2760,6 @@ msgstr ""
"et mettre le trou de la via à cette valeur spécifique en utilisant le menu popup."
#: pcbnew/dialog_track_options_base.cpp:56
#: pcbnew/pcbnew.h:288
msgid "Through Via"
msgstr "Via Traversante"
......@@ -3280,10 +2905,6 @@ msgid "Via %.3f"
msgstr "Via %.3f"
#: pcbnew/onrightclick.cpp:128
#: pcbnew/modedit_onclick.cpp:198
#: eeschema/onrightclick.cpp:104
#: eeschema/libedit_onrightclick.cpp:47
#: gerbview/onrightclick.cpp:41
msgid "End Tool"
msgstr "Fin Outil"
......@@ -3308,7 +2929,6 @@ msgid "Move Drawing"
msgstr "Déplace Tracé"
#: pcbnew/onrightclick.cpp:239
#: eeschema/onrightclick.cpp:210
msgid "End Drawing"
msgstr "Fin tracé"
......@@ -3317,7 +2937,6 @@ msgid "Edit Drawing"
msgstr "Edit Tracé"
#: pcbnew/onrightclick.cpp:244
#: eeschema/onrightclick.cpp:212
msgid "Delete Drawing"
msgstr "Supprimer Tracé"
......@@ -3334,7 +2953,6 @@ msgid "Delete Last Corner"
msgstr "Supprimer Dernier Sommet"
#: pcbnew/onrightclick.cpp:276
#: eeschema/onrightclick.cpp:157
msgid "Delete Marker"
msgstr "Effacer Marqueur"
......@@ -3451,23 +3069,14 @@ msgid "Read Global AutoRouter Data"
msgstr "Lire Données de L'autorouteur global"
#: pcbnew/onrightclick.cpp:451
#: pcbnew/modedit_onclick.cpp:208
#: eeschema/onrightclick.cpp:611
#: eeschema/libedit_onrightclick.cpp:231
#: gerbview/onrightclick.cpp:50
msgid "Cancel Block"
msgstr "Annuler Bloc"
#: pcbnew/onrightclick.cpp:453
#: eeschema/onrightclick.cpp:617
msgid "Zoom Block"
msgstr "Zoom Bloc"
#: pcbnew/onrightclick.cpp:456
#: pcbnew/modedit_onclick.cpp:213
#: eeschema/onrightclick.cpp:619
#: eeschema/libedit_onrightclick.cpp:238
#: gerbview/onrightclick.cpp:53
msgid "Place Block"
msgstr "Place Bloc"
......@@ -3587,10 +3196,6 @@ msgstr "Changer TOUTES Pistes (Pas les Vias)"
#: pcbnew/onrightclick.cpp:772
#: pcbnew/onrightclick.cpp:827
#: pcbnew/onrightclick.cpp:876
#: pcbnew/dialog_netlist.cpp:186
#: eeschema/edit_component_in_lib.cpp:129
#: eeschema/edit_component_in_lib.cpp:210
#: eeschema/menubar.cpp:133
msgid "Delete"
msgstr "Supprimer"
......@@ -3715,7 +3320,6 @@ msgid "Rotate +"
msgstr "Rotation +"
#: pcbnew/onrightclick.cpp:729
#: eeschema/onrightclick.cpp:290
msgid "Rotate -"
msgstr "Rotation -"
......@@ -3726,26 +3330,19 @@ msgstr "Change côté"
#: pcbnew/onrightclick.cpp:734
#: pcbnew/onrightclick.cpp:768
#: pcbnew/onrightclick.cpp:872
#: pcbnew/modedit_onclick.cpp:308
#: eeschema/onrightclick.cpp:302
msgid "Edit"
msgstr "Editer"
#: pcbnew/onrightclick.cpp:766
#: pcbnew/onrightclick.cpp:870
#: pcbnew/modedit_onclick.cpp:243
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:126
#: eeschema/dialog_edit_libentry_fields_in_lib_base.cpp:91
msgid "Rotate"
msgstr "Rotation"
#: pcbnew/onrightclick.cpp:805
#: pcbnew/modedit_onclick.cpp:265
msgid "Edit Pad"
msgstr "Edit Pad"
#: pcbnew/onrightclick.cpp:809
#: pcbnew/modedit_onclick.cpp:267
msgid "New Pad Settings"
msgstr "Nouvelles Caract. Pads"
......@@ -3754,7 +3351,6 @@ msgid "Copy current pad settings to this pad"
msgstr "Copier les réglages courants pour ce pad"
#: pcbnew/onrightclick.cpp:813
#: pcbnew/modedit_onclick.cpp:269
msgid "Export Pad Settings"
msgstr "Exporte Caract. Pads"
......@@ -3763,7 +3359,6 @@ msgid "Copy this pad settings to current pad settings"
msgstr "Copier les caractéristiques de ce pad vers les caractéristiques courantes"
#: pcbnew/onrightclick.cpp:820
#: pcbnew/modedit_onclick.cpp:276
msgid "Global Pad Settings"
msgstr "Edition Globale des pads"
......@@ -3808,25 +3403,18 @@ msgid "Open module editor"
msgstr "Ouvrir Editeur de modules"
#: pcbnew/tool_pcb.cpp:221
#: eeschema/tool_sch.cpp:62
#: gerbview/tool_gerber.cpp:202
msgid "Cut selected item"
msgstr "Suppression des éléments sélectionnés"
#: pcbnew/tool_pcb.cpp:225
#: eeschema/tool_sch.cpp:65
#: gerbview/tool_gerber.cpp:207
msgid "Copy selected item"
msgstr "Copie des éléments sélectionnés"
#: pcbnew/tool_pcb.cpp:228
#: eeschema/tool_sch.cpp:68
#: gerbview/tool_gerber.cpp:213
msgid "Paste"
msgstr "Copie des éléments sauvegardés"
#: pcbnew/tool_pcb.cpp:232
#: gerbview/tool_gerber.cpp:220
msgid "Undelete"
msgstr "Annulation du dernier effacement"
......@@ -3839,59 +3427,22 @@ msgid "Plot (HPGL, PostScript, or GERBER format)"
msgstr "Tracer en format HPGL, POSTSCRIPT ou GERBER"
#: pcbnew/tool_pcb.cpp:241
#: pcbnew/tool_modedit.cpp:105
#: eeschema/menubar.cpp:154
#: eeschema/menubar.cpp:155
#: eeschema/tool_lib.cpp:170
#: eeschema/tool_sch.cpp:89
#: eeschema/tool_viewlib.cpp:70
#: gerbview/tool_gerber.cpp:230
#: common/zoom.cpp:211
#: 3d-viewer/3d_toolbar.cpp:43
msgid "Zoom in"
msgstr "Zoom +"
#: pcbnew/tool_pcb.cpp:246
#: pcbnew/tool_modedit.cpp:110
#: eeschema/menubar.cpp:160
#: eeschema/menubar.cpp:162
#: eeschema/tool_lib.cpp:174
#: eeschema/tool_sch.cpp:93
#: eeschema/tool_viewlib.cpp:74
#: gerbview/tool_gerber.cpp:237
#: common/zoom.cpp:212
#: 3d-viewer/3d_toolbar.cpp:46
msgid "Zoom out"
msgstr "Zoom -"
#: pcbnew/tool_pcb.cpp:251
#: pcbnew/tool_modedit.cpp:115
#: eeschema/menubar.cpp:174
#: eeschema/tool_lib.cpp:178
#: eeschema/tool_sch.cpp:97
#: eeschema/tool_viewlib.cpp:78
#: gerbview/tool_gerber.cpp:244
#: common/zoom.cpp:220
#: 3d-viewer/3d_toolbar.cpp:49
msgid "Redraw view"
msgstr "Redessin de l'écran"
#: pcbnew/tool_pcb.cpp:258
#: pcbnew/tool_modedit.cpp:122
#: eeschema/menubar.cpp:167
#: eeschema/menubar.cpp:168
#: eeschema/menubar.cpp:176
#: eeschema/tool_lib.cpp:184
#: eeschema/tool_sch.cpp:102
#: gerbview/tool_gerber.cpp:255
#: common/zoom.cpp:213
#: 3d-viewer/3d_toolbar.cpp:52
msgid "Zoom auto"
msgstr "Zoom Automatique"
#: pcbnew/tool_pcb.cpp:261
#: eeschema/menubar.cpp:140
#: eeschema/tool_sch.cpp:106
msgid "Find components and texts"
msgstr "Recherche de composants et textes"
......@@ -3920,36 +3471,22 @@ msgid "Drc OFF"
msgstr "Drc DESACTIVEE"
#: pcbnew/tool_pcb.cpp:323
#: pcbnew/tool_modedit.cpp:208
#: eeschema/tool_sch.cpp:247
#: gerbview/tool_gerber.cpp:376
msgid "Display Grid OFF"
msgstr "Suppression de l'affichage de la grille"
#: pcbnew/tool_pcb.cpp:326
#: pcbnew/tool_modedit.cpp:212
#: gerbview/tool_gerber.cpp:382
msgid "Display Polar Coord ON"
msgstr "Activer affichage coord Polaires"
#: pcbnew/tool_pcb.cpp:329
#: pcbnew/tool_modedit.cpp:216
#: eeschema/tool_sch.cpp:251
#: gerbview/tool_gerber.cpp:386
msgid "Units in inches"
msgstr "Unités en pouces"
#: pcbnew/tool_pcb.cpp:332
#: pcbnew/tool_modedit.cpp:220
#: eeschema/tool_sch.cpp:255
#: gerbview/tool_gerber.cpp:390
msgid "Units in millimeters"
msgstr "Unités en millimètres"
#: pcbnew/tool_pcb.cpp:335
#: pcbnew/tool_modedit.cpp:227
#: eeschema/tool_sch.cpp:259
#: gerbview/tool_gerber.cpp:396
msgid "Change Cursor Shape"
msgstr "Sélection de la forme du curseur"
......@@ -3978,7 +3515,6 @@ msgid "Show outlines of filled areas only in zones"
msgstr "Afficher uniquement les contours des surfaces remplies dans les zones"
#: pcbnew/tool_pcb.cpp:365
#: pcbnew/tool_modedit.cpp:235
msgid "Show Pads Sketch"
msgstr "Afficher pastilles en contour"
......@@ -4015,17 +3551,14 @@ msgid "Add zones"
msgstr "Addition de Zones"
#: pcbnew/tool_pcb.cpp:438
#: pcbnew/tool_modedit.cpp:163
msgid "Add graphic line or polygon"
msgstr "Addition de lignes ou polygones graphiques"
#: pcbnew/tool_pcb.cpp:442
#: pcbnew/tool_modedit.cpp:167
msgid "Add graphic circle"
msgstr "Addition de graphiques (Cercle)"
#: pcbnew/tool_pcb.cpp:446
#: pcbnew/tool_modedit.cpp:171
msgid "Add graphic arc"
msgstr "Addition de graphiques (Arc de Cercle)"
......@@ -4038,16 +3571,10 @@ msgid "Add dimension"
msgstr "Ajout des cotes"
#: pcbnew/tool_pcb.cpp:459
#: gerbview/tool_gerber.cpp:337
msgid "Add layer alignment target"
msgstr "Ajouter Mire de superposition"
#: pcbnew/tool_pcb.cpp:464
#: pcbnew/tool_modedit.cpp:185
#: eeschema/menubar.cpp:133
#: eeschema/tool_lib.cpp:87
#: eeschema/tool_sch.cpp:225
#: gerbview/tool_gerber.cpp:352
msgid "Delete items"
msgstr "Suppression d'éléments"
......@@ -4084,19 +3611,14 @@ msgstr ""
" sinon utiliser la largeur courante"
#: pcbnew/tool_pcb.cpp:590
#: pcbnew/tool_modedit.cpp:285
#: eeschema/plotps.cpp:192
msgid "Auto"
msgstr "Auto"
#: pcbnew/tool_pcb.cpp:594
#: pcbnew/tool_modedit.cpp:289
msgid "Zoom "
msgstr "Zoom "
#: pcbnew/tool_pcb.cpp:632
#: pcbnew/tool_modedit.cpp:324
#: common/zoom.cpp:260
msgid "User Grid"
msgstr "Grille perso"
......@@ -4110,8 +3632,6 @@ msgid "Delete Pad (module %s %s) "
msgstr "Effacer Pad (module %s %s) "
#: pcbnew/files.cpp:21
#: kicad/files-io.cpp:36
#: gerbview/files.cpp:25
msgid "Printed circuit board"
msgstr "Circuit imprimé"
......@@ -4281,7 +3801,6 @@ msgid "Error writing to STRINGFORMATTER"
msgstr "Erreur d'écriture à STRINGFORMATTER"
#: pcbnew/dialog_gendrill.cpp:166
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:30
msgid "Millimeters"
msgstr "Millimètres"
......@@ -4339,7 +3858,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:38
msgid "None"
msgstr "Aucun"
......@@ -4380,17 +3898,10 @@ msgid "Speed (cm/s)"
msgstr "Vitesse plume ( cm/s )"
#: pcbnew/dialog_gendrill.cpp:233
#: eeschema/plothpgl.cpp:270
msgid "Pen Number"
msgstr "Numéro de plume"
#: pcbnew/dialog_gendrill.cpp:239
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:80
#: pcbnew/dialog_print_using_printer_base.cpp:76
#: eeschema/dialog_build_BOM_base.cpp:20
#: eeschema/dialog_build_BOM_base.cpp:60
#: eeschema/netlist_control.cpp:127
#: eeschema/dialog_print_using_printer_base.cpp:23
msgid "Options:"
msgstr "Options :"
......@@ -4468,7 +3979,6 @@ msgid "Connect"
msgstr "Connect"
#: pcbnew/class_board.cpp:555
#: eeschema/eelayer.h:115
msgid "NoConn"
msgstr "Non Conn"
......@@ -4481,7 +3991,6 @@ msgid "Adjust size,shape,layers... for Pads"
msgstr "Ajuster taille, forme, couches... pour pads"
#: pcbnew/menubarmodedit.cpp:50
#: pcbnew/set_grid.h:39
msgid "User Grid Size"
msgstr "Dim Grille utilisteur"
......@@ -4525,35 +4034,28 @@ msgstr "Lignes de Hachure"
msgid "Corners in DrawList"
msgstr "Sommets en Liste de dessin"
#: pcbnew/set_color.cpp:258
#: pcbnew/set_color.cpp:285
#: gerbview/set_color.cpp:248
#: gerbview/set_color.cpp:275
#: pcbnew/set_color.cpp:260
#: pcbnew/set_color.cpp:287
msgid "Show None"
msgstr "Rien Afficher"
#: pcbnew/set_color.cpp:267
#: gerbview/set_color.cpp:257
#: pcbnew/set_color.cpp:269
msgid "Show All"
msgstr "Tout Afficher"
#: pcbnew/set_color.cpp:279
#: pcbnew/set_color.cpp:281
msgid "Switch on all of the copper layers"
msgstr "Affiche toutes les couches cuivre"
#: pcbnew/set_color.cpp:288
#: pcbnew/set_color.cpp:290
msgid "Switch off all of the copper layers"
msgstr "N'affiche pas les couches cuivre"
#: pcbnew/set_color.cpp:350
#: eeschema/eelayer.cpp:248
#: gerbview/set_color.cpp:323
#: pcbnew/set_color.cpp:352
msgid "Apply"
msgstr "Appliquer"
#: pcbnew/modedit_onclick.cpp:210
#: eeschema/libedit_onrightclick.cpp:234
#: gerbview/onrightclick.cpp:51
msgid "Zoom Block (drag middle mouse)"
msgstr "Zoom Bloc (drag bouton du milieu souris)"
......@@ -4586,7 +4088,6 @@ msgid "Scale Y"
msgstr "Echelle Y"
#: pcbnew/modedit_onclick.cpp:252
#: pcbnew/dialog_edit_module.cpp:192
msgid "Edit Module"
msgstr "Edit Module"
......@@ -4684,7 +4185,6 @@ msgstr "Aspect des Contours"
#: pcbnew/dialog_non_copper_zones_properties_base.cpp:34
#: pcbnew/dialog_copper_zones_base.cpp:101
#: eeschema/dialog_options.cpp:262
msgid "Any"
msgstr "Tout"
......@@ -4697,7 +4197,6 @@ msgid "Zone Edges Orient"
msgstr "Direction contours zone"
#: pcbnew/dialog_non_copper_zones_properties_base.cpp:54
#: gerbview/select_layers_to_pcb.cpp:91
msgid "Layer selection:"
msgstr "Sélection couche:"
......@@ -4973,9 +4472,6 @@ msgid "Export this zone setup to all other copper zones"
msgstr "Exporter ces options vers les autres zones de cuivre"
#: pcbnew/dialog_copper_zones_base.cpp:156
#: pcbnew/dialog_pad_properties_base.cpp:91
#: eeschema/dialog_build_BOM_base.cpp:131
#: eeschema/lib_export.cpp:146
msgid "Ok"
msgstr "Ok"
......@@ -5040,16 +4536,10 @@ msgid "3D settings"
msgstr "3D Caract"
#: pcbnew/dialog_edit_module.cpp:185
#: eeschema/dialog_edit_libentry_fields_in_lib.cpp:161
#: eeschema/dialog_edit_component_in_schematic.cpp:96
#: common/wxwineda.cpp:223
msgid "X"
msgstr "X"
#: pcbnew/dialog_edit_module.cpp:186
#: eeschema/dialog_edit_libentry_fields_in_lib.cpp:166
#: eeschema/dialog_edit_component_in_schematic.cpp:101
#: common/wxwineda.cpp:236
msgid "Y"
msgstr "Y"
......@@ -5058,13 +4548,10 @@ msgid "Change module(s)"
msgstr "Change module(s)"
#: pcbnew/dialog_edit_module.cpp:196
#: pcbnew/dialog_pcb_text_properties.cpp:122
msgid "Position"
msgstr "Position"
#: pcbnew/dialog_edit_module.cpp:221
#: eeschema/dialog_edit_component_in_lib.cpp:203
#: eeschema/onrightclick.cpp:345
msgid "Doc"
msgstr "Doc"
......@@ -5077,24 +4564,18 @@ msgid "Fields:"
msgstr "Champs:"
#: pcbnew/dialog_edit_module.cpp:245
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:94
#: eeschema/dialog_edit_libentry_fields_in_lib_base.cpp:28
msgid "Add Field"
msgstr "Ajouter Champ"
#: pcbnew/dialog_edit_module.cpp:250
#: eeschema/onrightclick.cpp:250
msgid "Edit Field"
msgstr "Editer Champ"
#: pcbnew/dialog_edit_module.cpp:255
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:99
#: eeschema/dialog_edit_libentry_fields_in_lib_base.cpp:33
msgid "Delete Field"
msgstr "Supprimer Champ"
#: pcbnew/dialog_edit_module.cpp:262
#: common/common.cpp:481
msgid "Component"
msgstr "Composant"
......@@ -5172,7 +4653,6 @@ msgid "3D Shape Name"
msgstr "3D forme"
#: pcbnew/dialog_edit_module.cpp:423
#: eeschema/dialog_eeschema_config.cpp:223
msgid "Browse"
msgstr "Examiner"
......@@ -5210,54 +4690,38 @@ msgid "Delete [%s]"
msgstr "Supprimer [%s]"
#: pcbnew/dialog_SVG_print_base.cpp:25
#: pcbnew/dialog_print_using_printer_base.cpp:25
msgid "Copper Layers:"
msgstr "Couches Cuivre:"
#: pcbnew/dialog_SVG_print_base.cpp:29
#: pcbnew/dialog_print_using_printer_base.cpp:29
msgid "Technical Layers:"
msgstr "Couches Techniques:"
#: pcbnew/dialog_SVG_print_base.cpp:36
#: eeschema/dialog_SVG_print_base.cpp:23
msgid "Print SVG options:"
msgstr "Options d'impression SVG :"
#: pcbnew/dialog_SVG_print_base.cpp:38
#: eeschema/dialog_SVG_print_base.cpp:25
msgid "Pen width mini"
msgstr "Epaiss plume mini"
#: pcbnew/dialog_SVG_print_base.cpp:43
#: pcbnew/dialog_print_using_printer_base.cpp:83
#: eeschema/dialog_SVG_print_base.cpp:30
#: eeschema/dialog_print_using_printer_base.cpp:30
msgid "Selection of the minimum pen thickness used to draw items."
msgstr "Valeur de l'épaisseur minimum de plume pour tracer les éléments"
#: pcbnew/dialog_SVG_print_base.cpp:47
#: pcbnew/dialog_print_using_printer_base.cpp:100
#: eeschema/plotps.cpp:212
#: eeschema/dialog_SVG_print_base.cpp:34
#: eeschema/dialog_print_using_printer_base.cpp:44
msgid "Color"
msgstr "Couleur"
#: pcbnew/dialog_SVG_print_base.cpp:47
#: eeschema/dialog_SVG_print_base.cpp:34
msgid "Black and White"
msgstr "Noir et Blanc"
#: pcbnew/dialog_SVG_print_base.cpp:49
#: eeschema/dialog_SVG_print_base.cpp:36
msgid "Print mode"
msgstr "Mode d'impression"
#: pcbnew/dialog_SVG_print_base.cpp:51
#: pcbnew/dialog_print_using_printer_base.cpp:104
#: eeschema/dialog_SVG_print_base.cpp:38
#: eeschema/dialog_print_using_printer_base.cpp:48
msgid ""
"Choose if you wand to draw the sheet like it appears on screen,\n"
"or in black and white mode, better to print it when using black and white printers"
......@@ -5266,14 +4730,10 @@ msgstr ""
"ou en noir et blanc, préférable pour l'imprimer lorsque l'on utilise des imprimantes monochromes"
#: pcbnew/dialog_SVG_print_base.cpp:55
#: eeschema/dialog_SVG_print_base.cpp:42
msgid "Print Frame Ref"
msgstr "Imprimer cartouche"
#: pcbnew/dialog_SVG_print_base.cpp:58
#: pcbnew/dialog_print_using_printer_base.cpp:90
#: eeschema/dialog_SVG_print_base.cpp:44
#: eeschema/dialog_print_using_printer_base.cpp:38
msgid "Print (or not) the Frame references."
msgstr "Imprimer (ou non) le cartouche"
......@@ -5294,18 +4754,14 @@ msgid "Print Board"
msgstr "Imprimer le C.I."
#: pcbnew/dialog_SVG_print_base.cpp:80
#: eeschema/dialog_SVG_print_base.cpp:59
msgid "Quit"
msgstr "Quitter"
#: pcbnew/dialog_SVG_print_base.cpp:87
#: eeschema/sheet.cpp:154
#: eeschema/dialog_SVG_print_base.cpp:66
msgid "Filename:"
msgstr "Nom Fichier:"
#: pcbnew/dialog_SVG_print_base.cpp:92
#: eeschema/dialog_SVG_print_base.cpp:71
msgid ""
"Enter a filename if you do not want to use default file names\n"
"Can be used only when printing the current sheet"
......@@ -5314,7 +4770,6 @@ msgstr ""
"Ne peut être utilisé que pour imprimer la feuille courante"
#: pcbnew/dialog_SVG_print_base.cpp:97
#: eeschema/dialog_SVG_print_base.cpp:76
msgid "Messages:"
msgstr "Messages:"
......@@ -5393,12 +4848,10 @@ msgid "90"
msgstr "90"
#: pcbnew/dialog_pad_properties_base.cpp:64
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:39
msgid "-90"
msgstr "-90"
#: pcbnew/dialog_pad_properties_base.cpp:64
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:39
msgid "180"
msgstr "180"
......@@ -5415,7 +4868,6 @@ msgid "SMD"
msgstr "CMS"
#: pcbnew/dialog_pad_properties_base.cpp:80
#: eeschema/netlist.cpp:246
msgid "Conn"
msgstr "Conn"
......@@ -5476,7 +4928,6 @@ msgid "Draft layer"
msgstr "Couche dessin"
#: pcbnew/muwave_command.cpp:51
#: eeschema/libframe.cpp:522
msgid "Add Line"
msgstr "Addition de lignes"
......@@ -5497,50 +4948,30 @@ msgid "Add Polynomial Shape"
msgstr "Ajout Forme polynomiale"
#: pcbnew/dialog_setup_libs.cpp:89
#: eeschema/dialog_eeschema_config.cpp:97
#: cvpcb/dialog_cvpcb_config.cpp:75
#: gerbview/reglage.cpp:89
msgid "from "
msgstr "De "
#: pcbnew/dialog_setup_libs.cpp:145
#: eeschema/dialog_eeschema_config.cpp:153
#: cvpcb/dialog_cvpcb_config.cpp:128
#: cvpcb/dialog_display_options.cpp:169
msgid "Save Cfg"
msgstr "Sauver config"
#: pcbnew/dialog_setup_libs.cpp:151
#: eeschema/dialog_eeschema_config.cpp:170
#: cvpcb/dialog_cvpcb_config.cpp:143
msgid "Files ext:"
msgstr "Ext. Fichiers"
#: pcbnew/dialog_setup_libs.cpp:167
#: cvpcb/dialog_cvpcb_config.cpp:162
#: cvpcb/dialog_cvpcb_config.cpp:194
msgid "Del"
msgstr "Supprimer"
#: pcbnew/dialog_setup_libs.cpp:171
#: eeschema/edit_component_in_lib.cpp:123
#: eeschema/edit_component_in_lib.cpp:202
#: eeschema/dialog_eeschema_config.cpp:189
#: cvpcb/dialog_cvpcb_config.cpp:166
#: cvpcb/dialog_cvpcb_config.cpp:198
msgid "Add"
msgstr "Ajouter"
#: pcbnew/dialog_setup_libs.cpp:175
#: eeschema/dialog_eeschema_config.cpp:195
#: cvpcb/dialog_cvpcb_config.cpp:170
#: cvpcb/dialog_cvpcb_config.cpp:202
msgid "Ins"
msgstr "Insérer"
#: pcbnew/dialog_setup_libs.cpp:183
#: eeschema/dialog_eeschema_config.cpp:205
#: cvpcb/dialog_cvpcb_config.cpp:177
msgid "Libraries"
msgstr "Librairies"
......@@ -5549,7 +4980,6 @@ msgid "Lib Modules Dir:"
msgstr "Répertoire Lib Modules:"
#: pcbnew/dialog_setup_libs.cpp:198
#: cvpcb/menucfg.cpp:55
msgid "Module Doc File:"
msgstr "Fichiers Doc des Modules"
......@@ -5570,15 +5000,10 @@ msgid "Net ext: "
msgstr "Net ext: "
#: pcbnew/dialog_setup_libs.cpp:359
#: eeschema/dialog_eeschema_config.cpp:360
#: cvpcb/menucfg.cpp:220
msgid "Library files:"
msgstr "Fichiers Librairies:"
#: pcbnew/dialog_setup_libs.cpp:387
#: eeschema/dialog_eeschema_config.cpp:389
#: cvpcb/menucfg.cpp:248
#: cvpcb/menucfg.cpp:322
msgid "Library already in use"
msgstr "Librairie déjà en usage"
......@@ -5645,7 +5070,6 @@ msgid "Offset Y"
msgstr "Offset Y"
#: pcbnew/dialog_edit_module_text_base.cpp:72
#: eeschema/affiche.cpp:196
msgid "Thickness"
msgstr "Epaisseur"
......@@ -5658,7 +5082,6 @@ msgid "vertical"
msgstr "Vertical"
#: pcbnew/dialog_edit_module_text_base.cpp:81
#: pcbnew/dialog_pcb_text_properties.cpp:141
msgid "Orientation"
msgstr "Orientation"
......@@ -5671,27 +5094,18 @@ msgid "Invisible"
msgstr "Invisible"
#: pcbnew/dialog_edit_module_text_base.cpp:96
#: pcbnew/dialog_pcb_text_properties.cpp:176
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:134
#: eeschema/dialog_edit_label_base.cpp:40
#: eeschema/dialog_bodygraphictext_properties_base.cpp:60
#: eeschema/dialog_edit_libentry_fields_in_lib_base.cpp:99
msgid "Italic"
msgstr "Italique"
#: pcbnew/dialog_edit_module_text_base.cpp:98
#: pcbnew/dialog_pcb_text_properties.cpp:177
#: eeschema/dialog_edit_label_base.cpp:42
msgid "Style"
msgstr "Style"
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:22
#: gerbview/options.cpp:183
msgid "No Display"
msgstr "Pas d'affichage"
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:24
#: gerbview/options.cpp:186
msgid "Display Polar Coord"
msgstr "Affichage coord Polaires"
......@@ -5704,8 +5118,6 @@ msgstr ""
"au curseur, en coordonnées polaires (angle et distance)"
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:32
#: eeschema/dialog_options.cpp:253
#: gerbview/options.cpp:198
msgid "Units"
msgstr "Unités"
......@@ -5722,7 +5134,6 @@ msgid "Full screen cursor"
msgstr "Curseur plein écran"
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:40
#: gerbview/options.cpp:206
msgid "Cursor"
msgstr "Curseur"
......@@ -5731,48 +5142,38 @@ msgid "Main cursor shape selection (small cross or large cursor)"
msgstr "Sélection de l'aspect du curseur principal (petite croix ou grand curseur)"
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:51
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:28
#: eeschema/component_wizard/dialog_component_setup.cpp:164
msgid "1"
msgstr "1"
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:51
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:28
msgid "2"
msgstr "2"
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:51
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:28
msgid "4"
msgstr "4"
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:51
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:28
msgid "6"
msgstr "6"
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:51
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:28
msgid "8"
msgstr "8"
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:51
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:28
msgid "10"
msgstr "10"
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:51
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:28
msgid "12"
msgstr "12"
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:51
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:28
msgid "14"
msgstr "14"
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:51
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:28
msgid "16"
msgstr "16"
......@@ -5853,7 +5254,6 @@ msgid "If enabled, force segments directions to H, V or 45 degrees, when creatin
msgstr "Si activé, frorce la direction des segments à H, V ou 45° en création de segments sur couches techniques"
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:113
#: eeschema/dialog_options.cpp:245
msgid "Auto PAN"
msgstr "Auto PAN"
......@@ -5891,7 +5291,6 @@ msgid "Control the capture of the pcb cursor when the mouse cursor enters a trac
msgstr "Contrôle la capture du curseur pcb quand le curseur souris passe sur une piste"
#: pcbnew/tool_modedit.cpp:41
#: eeschema/tool_lib.cpp:117
msgid "Select working library"
msgstr "Sélection de la librairie de travail"
......@@ -5932,16 +5331,10 @@ msgid "export module"
msgstr "Exporter Module"
#: pcbnew/tool_modedit.cpp:91
#: eeschema/menubar.cpp:120
#: eeschema/tool_lib.cpp:144
#: eeschema/tool_sch.cpp:71
msgid "Undo last edition"
msgstr "Défait dernière édition"
#: pcbnew/tool_modedit.cpp:93
#: eeschema/menubar.cpp:126
#: eeschema/tool_lib.cpp:146
#: eeschema/tool_sch.cpp:74
msgid "Redo the last undo command"
msgstr "Refait la dernière commande defaite"
......@@ -5985,8 +5378,6 @@ msgstr "Valeur:"
#: pcbnew/dialog_edit_module_text.cpp:98
#: pcbnew/dialog_pcb_text_properties.cpp:108
#: eeschema/sheetlab.cpp:103
#: eeschema/dialog_bodygraphictext_properties_base.cpp:22
msgid "Text:"
msgstr "Texte:"
......@@ -6035,22 +5426,18 @@ msgid "Y Scale Adjust"
msgstr "Ajustage Echelle Y"
#: pcbnew/dialog_print_using_printer_base.cpp:78
#: eeschema/dialog_print_using_printer_base.cpp:25
msgid "Pen Width Mini"
msgstr "Epaiss Plume Mini"
#: pcbnew/dialog_print_using_printer_base.cpp:87
#: eeschema/dialog_print_using_printer_base.cpp:35
msgid "Print frame ref"
msgstr "Imprimer cartouche"
#: pcbnew/dialog_print_using_printer_base.cpp:100
#: eeschema/dialog_print_using_printer_base.cpp:44
msgid "Black and white"
msgstr "Noir et blanc"
#: pcbnew/dialog_print_using_printer_base.cpp:102
#: eeschema/dialog_print_using_printer_base.cpp:46
msgid "Print Mode"
msgstr "Mode d'impression"
......@@ -6063,19 +5450,14 @@ msgid "Single page"
msgstr "Page unique"
#: pcbnew/dialog_print_using_printer_base.cpp:110
#: eeschema/dialog_print_using_printer_base.cpp:54
msgid "Page Print"
msgstr "Imprimer Page"
#: pcbnew/dialog_print_using_printer_base.cpp:119
#: eeschema/dialog_print_using_printer_base.cpp:63
msgid "Page Options"
msgstr "Options Pages"
#: pcbnew/dialog_print_using_printer_base.cpp:122
#: eeschema/dialog_print_using_printer_base.cpp:66
#: eeschema/dialog_print_using_printer.cpp:238
#: eeschema/dialog_print_using_printer.cpp:278
msgid "Preview"
msgstr "Prévisualisation"
......@@ -6118,7 +5500,6 @@ msgid "Start Point Y"
msgstr "Start Point Y"
#: eeschema/netlist.cpp:198
#: eeschema/dialog_build_BOM_base.cpp:47
msgid "List"
msgstr "Liste"
......@@ -6158,7 +5539,6 @@ msgid "Clear Schematic Hierarchy (modified!)?"
msgstr "Effacer la hiérarchie schématique (modifiée!)?"
#: eeschema/files-io.cpp:84
#: eeschema/save_schemas.cpp:63
msgid "Schematic files:"
msgstr "Fichiers schématiques:"
......@@ -6208,12 +5588,10 @@ msgid "Warning More than 1 Pin connected to UnConnect symbol"
msgstr "Attention: plus de 1 Pin connectée à un symbole de non connexion"
#: eeschema/erc.cpp:599
#: common/confirm.cpp:84
msgid "Warning"
msgstr "Avertissement"
#: eeschema/erc.cpp:602
#: common/confirm.cpp:88
msgid "Error"
msgstr "Erreur"
......@@ -6301,7 +5679,6 @@ msgid "Failed to open Stuff File <%s>"
msgstr "Ne peut pas ouvrir fichier d'échange <%s>"
#: eeschema/selpart.cpp:39
#: eeschema/find.cpp:646
msgid "No libraries are loaded"
msgstr "Pas de librairies chargées"
......@@ -6316,22 +5693,18 @@ msgstr "Sélection composant (%d items)"
#: eeschema/netform.cpp:62
#: eeschema/netform.cpp:280
#: eeschema/save_schemas.cpp:88
msgid "Failed to create file "
msgstr "Impossible de créer le fichier "
#: eeschema/plotps.cpp:193
#: eeschema/plothpgl.cpp:214
msgid "Page Size A4"
msgstr "Feuille A4"
#: eeschema/plotps.cpp:194
#: eeschema/plothpgl.cpp:219
msgid "Page Size A"
msgstr "Feuille A"
#: eeschema/plotps.cpp:196
#: eeschema/plothpgl.cpp:225
msgid "Plot page size:"
msgstr "Format de la feuille:"
......@@ -6352,12 +5725,10 @@ msgid "Print Sheet Ref"
msgstr "Imprimer cartouche"
#: eeschema/plotps.cpp:233
#: eeschema/plothpgl.cpp:328
msgid "&Plot page"
msgstr "&Tracer Page"
#: eeschema/plotps.cpp:240
#: eeschema/plothpgl.cpp:334
msgid "Plot a&ll"
msgstr "&Tout tracer"
......@@ -6366,7 +5737,6 @@ msgid "Messages :"
msgstr "Messages :"
#: eeschema/plotps.cpp:273
#: eeschema/dialog_options.cpp:315
msgid "Default Line Width"
msgstr "Epaiss. ligne par défaut"
......@@ -6376,37 +5746,30 @@ msgid "Plot: %s\n"
msgstr "Trace: %s\n"
#: eeschema/pinedit.cpp:22
#: eeschema/pinedit-dialog.cpp:241
msgid "line"
msgstr "Ligne"
#: eeschema/pinedit.cpp:22
#: eeschema/pinedit-dialog.cpp:242
msgid "invert"
msgstr "invert"
#: eeschema/pinedit.cpp:22
#: eeschema/pinedit-dialog.cpp:243
msgid "clock"
msgstr "clock"
#: eeschema/pinedit.cpp:22
#: eeschema/pinedit-dialog.cpp:244
msgid "clock inv"
msgstr "clock inv"
#: eeschema/pinedit.cpp:23
#: eeschema/pinedit-dialog.cpp:245
msgid "low in"
msgstr "low in"
#: eeschema/pinedit.cpp:23
#: eeschema/pinedit-dialog.cpp:246
msgid "low clock"
msgstr "low clock"
#: eeschema/pinedit.cpp:23
#: eeschema/pinedit-dialog.cpp:247
msgid "low out"
msgstr "low out"
......@@ -6437,13 +5800,10 @@ msgid "Options :"
msgstr "Options :"
#: eeschema/dialog_cmp_graphic_properties.cpp:156
#: eeschema/dialog_bodygraphictext_properties_base.cpp:34
msgid "Common to Units"
msgstr "Commun aux Unités"
#: eeschema/dialog_cmp_graphic_properties.cpp:160
#: eeschema/pinedit-dialog.cpp:187
#: eeschema/dialog_bodygraphictext_properties_base.cpp:38
msgid "Common to convert"
msgstr "Commun à converti"
......@@ -6468,7 +5828,6 @@ msgid "No show Hidden Pins"
msgstr "N'affichage pas les pins invisibles"
#: eeschema/schframe.cpp:427
#: eeschema/tool_sch.cpp:264
msgid "Show Hidden Pins"
msgstr "Force affichage des pins invisibles"
......@@ -6557,16 +5916,19 @@ msgstr "Propriétés du Label Global"
msgid "Hierarchal Label Properties"
msgstr "Propriétés du Label Hiérarchique"
#: eeschema/dialog_edit_label.cpp:66
#: eeschema/dialog_edit_label.cpp:63
msgid "Hlabel Shape"
msgstr "Forme HLabel"
#: eeschema/dialog_edit_label.cpp:67
msgid "Label Properties"
msgstr "Propriétés du label"
#: eeschema/dialog_edit_label.cpp:70
#: eeschema/dialog_edit_label.cpp:71
msgid "Text Properties"
msgstr "Propriétés du Texte"
#: eeschema/edit_component_in_lib.cpp:68
#: eeschema/dialog_edit_component_in_lib.h:56
msgid "Lib Component Properties"
msgstr "Propriétés du composant librairie"
......@@ -6579,7 +5941,6 @@ msgid "(alias of "
msgstr "(alias de "
#: eeschema/edit_component_in_lib.cpp:106
#: eeschema/dialog_edit_component_in_lib.cpp:207
msgid "Alias"
msgstr "Alias"
......@@ -6598,7 +5959,6 @@ msgid "Footprints"
msgstr "Modules"
#: eeschema/edit_component_in_lib.cpp:291
#: eeschema/dialog_create_component.cpp:172
msgid "As Convert"
msgstr "A une forme \"convertie\""
......@@ -6607,12 +5967,10 @@ msgid "Show Pin Num"
msgstr "Montre Numéro de Pin"
#: eeschema/edit_component_in_lib.cpp:308
#: eeschema/dialog_create_component.cpp:243
msgid "Show Pin Name"
msgstr "Montre Nom de Pin"
#: eeschema/edit_component_in_lib.cpp:319
#: eeschema/dialog_create_component.cpp:247
msgid "Pin Name Inside"
msgstr "Nom de pin à l'intérieur"
......@@ -6658,7 +6016,6 @@ msgid "Delete Convert items"
msgstr "Suppression des éléments convertis"
#: eeschema/edit_component_in_lib.cpp:760
#: common/eda_doc.cpp:126
msgid "Doc Files"
msgstr "Fichiers de Doc"
......@@ -7026,7 +6383,6 @@ msgid "Add NoConnect Flag"
msgstr "Ajoutde symboles de non connexion"
#: eeschema/schedit.cpp:192
#: eeschema/hotkeys.cpp:310
msgid "Add Wire"
msgstr "Ajouter Fils"
......@@ -7035,14 +6391,10 @@ msgid "Add Bus"
msgstr "Addition de Bus"
#: eeschema/schedit.cpp:204
#: eeschema/onrightclick.cpp:515
#: eeschema/onrightclick.cpp:547
msgid "Add Junction"
msgstr "Ajout jonctions"
#: eeschema/schedit.cpp:208
#: eeschema/onrightclick.cpp:516
#: eeschema/onrightclick.cpp:548
msgid "Add Label"
msgstr "Ajout Label"
......@@ -7075,7 +6427,6 @@ msgid "Import PinSheet"
msgstr "Importer Connecteur de hiérarchie"
#: eeschema/schedit.cpp:244
#: eeschema/hotkeys.cpp:285
msgid "Add Component"
msgstr "Ajout Composant"
......@@ -7084,19 +6435,14 @@ msgid "Add Power"
msgstr "Ajouter Alims"
#: eeschema/menubar.cpp:42
#: kicad/buildmnu.cpp:128
#: gerbview/tool_gerber.cpp:52
msgid "&New"
msgstr "&Nouveau"
#: eeschema/menubar.cpp:43
#: eeschema/tool_sch.cpp:36
msgid "New schematic project"
msgstr "Nouveau Projet schématique"
#: eeschema/menubar.cpp:47
#: cvpcb/tool_cvpcb.cpp:112
#: kicad/buildmnu.cpp:122
msgid "&Open"
msgstr "&Ouvrir "
......@@ -7113,7 +6459,6 @@ msgid "Save all sheets in the schematic project"
msgstr "Sauver toutes les feuilles du projet schématique"
#: eeschema/menubar.cpp:59
#: kicad/buildmnu.cpp:135
msgid "&Save"
msgstr "&Sauver"
......@@ -7182,7 +6527,6 @@ msgid "&Redo\t"
msgstr "&Redo\t"
#: eeschema/menubar.cpp:139
#: pcbnew/find.h:38
msgid "Find"
msgstr "Chercher"
......@@ -7231,7 +6575,6 @@ msgid "W&ire to bus entry"
msgstr "Entrées de bus (type fil vers bus)"
#: eeschema/menubar.cpp:207
#: eeschema/tool_sch.cpp:170
msgid "Place a wire to bus entry"
msgstr "Placer une Entrée de Bus (type fil vers bus)"
......@@ -7240,7 +6583,6 @@ msgid "B&us to bus entry"
msgstr "Entrées de bus (type bus vers bus)"
#: eeschema/menubar.cpp:213
#: eeschema/tool_sch.cpp:174
msgid "Place a bus to bus entry"
msgstr "Placer une Entrée de Bus (type bus vers bus)"
......@@ -7257,7 +6599,6 @@ msgid "Net name"
msgstr "Net Name"
#: eeschema/menubar.cpp:223
#: eeschema/tool_sch.cpp:183
msgid "Place net name"
msgstr "Place nom de net"
......@@ -7270,7 +6611,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 hiérarchie"
#: eeschema/menubar.cpp:233
#: eeschema/eelayer.h:85
msgid "Junction"
msgstr "Jonction"
......@@ -7283,7 +6623,6 @@ msgid "Hierarchical label"
msgstr "Label Hiérarchique"
#: eeschema/menubar.cpp:242
#: eeschema/tool_sch.cpp:197
msgid "Place a hierarchical label. This label will be seen as a pin sheet in the sheet symbol"
msgstr "Placer un label hiérachique. Ce label sera vu comme une pin dans la feuille mère symbole"
......@@ -7324,7 +6663,6 @@ msgid "Graphic text (comment)"
msgstr "Textes graphiques (commentaires)"
#: eeschema/menubar.cpp:278
#: eeschema/tool_sch.cpp:220
msgid "Place graphic text (comment)"
msgstr "Placer textes graphiques (commentaires)"
......@@ -7332,12 +6670,15 @@ msgstr "Placer textes graphiques (commentaires)"
msgid "Library preferences"
msgstr "Préférences pour Librairie"
#: eeschema/menubar.cpp:290
msgid "&Colors"
msgstr "&Couleurs"
#: eeschema/menubar.cpp:291
msgid "Color preferences"
msgstr "Préférences de couleurs"
#: eeschema/menubar.cpp:296
#: gerbview/tool_gerber.cpp:86
msgid "&Options"
msgstr "&Options"
......@@ -7358,7 +6699,6 @@ msgid "Open the eeschema manual"
msgstr "Ouvrir la documentation de eeschema"
#: eeschema/menubar.cpp:327
#: kicad/buildmnu.cpp:263
msgid "&About"
msgstr "&Au Sujet de"
......@@ -7388,7 +6728,6 @@ msgstr "Sélection"
#: eeschema/viewlibs.cpp:122
#: eeschema/tool_sch.cpp:53
#: eeschema/viewlib_frame.cpp:59
msgid "Library browser"
msgstr "Visualisateur des librairies"
......@@ -7512,7 +6851,6 @@ msgid "Edit pins part per part (Carefully use!)"
msgstr "Editer pins unité par unité (Utiliser en connaissance de cause)"
#: eeschema/tool_lib.cpp:241
#: eeschema/tool_viewlib.cpp:137
#, c-format
msgid "Part %c"
msgstr "Composant %c"
......@@ -7542,26 +6880,18 @@ msgid "No Draw"
msgstr "Invisible"
#: eeschema/pinedit-dialog.cpp:213
#: eeschema/affiche.cpp:112
#: eeschema/dialog_edit_label_base.cpp:34
msgid "Right"
msgstr "Droite"
#: eeschema/pinedit-dialog.cpp:214
#: eeschema/affiche.cpp:109
#: eeschema/dialog_edit_label_base.cpp:34
msgid "Left"
msgstr "Gauche"
#: eeschema/pinedit-dialog.cpp:215
#: eeschema/affiche.cpp:103
#: eeschema/dialog_edit_label_base.cpp:34
msgid "Up"
msgstr "Haut"
#: eeschema/pinedit-dialog.cpp:216
#: eeschema/affiche.cpp:106
#: eeschema/dialog_edit_label_base.cpp:34
msgid "Down"
msgstr "Bas"
......@@ -7574,19 +6904,14 @@ msgid "Pin Shape:"
msgstr "Forme Pin:"
#: eeschema/pinedit-dialog.cpp:254
#: eeschema/dialog_edit_label_base.cpp:46
#: eeschema/component_wizard/dialog_component_setup.cpp:201
msgid "Input"
msgstr "Entrée"
#: eeschema/pinedit-dialog.cpp:255
#: eeschema/dialog_edit_label_base.cpp:46
#: eeschema/component_wizard/dialog_component_setup.cpp:202
msgid "Output"
msgstr "Sortie"
#: eeschema/pinedit-dialog.cpp:256
#: eeschema/dialog_edit_label_base.cpp:46
msgid "Bidi"
msgstr "Bidi"
......@@ -7595,13 +6920,10 @@ msgid "3 States"
msgstr "3 Etats"
#: eeschema/pinedit-dialog.cpp:258
#: eeschema/dialog_edit_label_base.cpp:46
#: eeschema/component_wizard/dialog_component_setup.cpp:205
msgid "Passive"
msgstr "Passive"
#: eeschema/pinedit-dialog.cpp:259
#: eeschema/component_wizard/dialog_component_setup.cpp:206
msgid "Unspecified"
msgstr "Non specifié"
......@@ -7626,7 +6948,6 @@ msgid "Electrical Type:"
msgstr "Type électrique:"
#: eeschema/component_class.cpp:56
#: eeschema/dialog_create_component.cpp:160
msgid "U"
msgstr "U"
......@@ -7790,8 +7111,6 @@ msgid "Done Loading "
msgstr "Chargement terminé"
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:26
#: eeschema/affiche.cpp:180
#: eeschema/onrightclick.cpp:330
msgid "Unit"
msgstr "Unité"
......@@ -7872,7 +7191,6 @@ msgid "Orientation (Degrees)"
msgstr "Orientation (Degrés)"
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:43
#: eeschema/dialog_edit_libentry_fields_in_lib_base.cpp:58
msgid "Select if the component is to be rotated when drawn"
msgstr "Sélectionner si le composant doit être tourné lors de l'affichage."
......@@ -7885,12 +7203,10 @@ msgid "Mirror |"
msgstr "Miroir |"
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:56
#: eeschema/dialog_edit_libentry_fields_in_lib_base.cpp:71
msgid "Pick the graphical transformation to be used when displaying the component, if any"
msgstr "Ajuster la transformation graphique à utiliser pour afficher le composant"
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:63
#: eeschema/dialog_edit_libentry_fields_in_lib.cpp:446
msgid "Chip Name"
msgstr "Nom en librairie"
......@@ -7899,8 +7215,6 @@ msgid "The name of the symbol in the library from which this component came"
msgstr "Le nom du symbole dans la librairie d'où vient le composant."
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:73
#: eeschema/affiche.cpp:190
#: eeschema/onrightclick.cpp:317
msgid "Convert"
msgstr "Convert"
......@@ -7913,73 +7227,54 @@ msgstr ""
"Pour les portes, ceci est la conversion \"De Morgan\""
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:79
#: eeschema/dialog_edit_component_in_lib.cpp:162
#: eeschema/dialog_create_component.cpp:180
msgid "Parts are locked"
msgstr "Les parts sont verrouillées"
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:86
#: eeschema/dialog_edit_libentry_fields_in_lib_base.cpp:20
#: eeschema/eelayer.h:164
msgid "Fields"
msgstr "Champs"
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:95
#: eeschema/dialog_edit_libentry_fields_in_lib_base.cpp:29
msgid "Add a new custom field"
msgstr "Ajouter un nouveau champ utilisateur"
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:100
#: eeschema/dialog_edit_libentry_fields_in_lib_base.cpp:34
msgid "Delete one of the optional fields"
msgstr "Supprimer un des champs optionnels."
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:104
#: eeschema/dialog_edit_libentry_fields_in_lib_base.cpp:38
msgid "Move Up"
msgstr "Vers le haut ^"
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:105
#: eeschema/dialog_edit_libentry_fields_in_lib_base.cpp:39
msgid "Move the selected optional fields up one position"
msgstr "Déplacer le champ optionnel sélectionné de une position vers le haut"
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:115
#: eeschema/dialog_edit_libentry_fields_in_lib_base.cpp:80
msgid "Visibility"
msgstr "Visibilité"
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:120
#: eeschema/dialog_edit_libentry_fields_in_lib_base.cpp:85
msgid "Show"
msgstr "Visible"
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:122
#: eeschema/dialog_edit_libentry_fields_in_lib_base.cpp:87
msgid "Check if you want this field visible"
msgstr "Activer si vous voulez avoir ce champ visible"
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:128
#: eeschema/dialog_edit_libentry_fields_in_lib_base.cpp:93
msgid "Check if you want this field's text rotated 90 degrees"
msgstr "Activer si vous voulez avoir le texte de ce champ tourné à 90°"
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:134
#: eeschema/dialog_edit_label_base.cpp:40
#: eeschema/dialog_bodygraphictext_properties_base.cpp:60
#: eeschema/dialog_edit_libentry_fields_in_lib_base.cpp:99
msgid "Bold"
msgstr "Gras"
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:134
#: eeschema/dialog_edit_label_base.cpp:40
#: eeschema/dialog_bodygraphictext_properties_base.cpp:60
#: eeschema/dialog_edit_libentry_fields_in_lib_base.cpp:99
msgid "Bold Italic"
msgstr "Gras Italique"
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:136
#: eeschema/dialog_edit_libentry_fields_in_lib_base.cpp:101
msgid "Style:"
msgstr "Style:"
......@@ -7988,7 +7283,6 @@ msgid "The style of the currently selected field's text in the schemati"
msgstr "Le style du texte du champ actuellement sélectionné"
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:147
#: eeschema/dialog_edit_libentry_fields_in_lib_base.cpp:110
msgid "Field Name"
msgstr "Nom Champ"
......@@ -8001,18 +7295,14 @@ msgstr ""
"Quelques noms de champs fixés ne sont pas modifiables."
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:161
#: eeschema/dialog_edit_libentry_fields_in_lib_base.cpp:124
msgid "Field Value"
msgstr "Texte Champ"
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:166
#: eeschema/dialog_edit_libentry_fields_in_lib_base.cpp:115
#: eeschema/dialog_edit_libentry_fields_in_lib_base.cpp:129
msgid "The text (or value) of the currently selected field"
msgstr "Le texte (ou la valeur) du champ actuellement sélectionné"
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:175
#: eeschema/dialog_edit_libentry_fields_in_lib_base.cpp:138
msgid "Size(\")"
msgstr "Taille(\")"
......@@ -8021,7 +7311,6 @@ msgid "The size of the currently selected field's text in the schematic"
msgstr "La taille du texte du champ actuellement sélectionné"
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:192
#: eeschema/dialog_edit_libentry_fields_in_lib_base.cpp:155
msgid "PosX(\")"
msgstr "PosX"
......@@ -8030,12 +7319,10 @@ msgid "The X coordinate of the text relative to the component"
msgstr "La position X du texte relativement au composant"
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:206
#: eeschema/dialog_edit_libentry_fields_in_lib_base.cpp:167
msgid "PosY(\")"
msgstr "PosY"
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:211
#: eeschema/dialog_edit_libentry_fields_in_lib_base.cpp:172
msgid "The Y coordinate of the text relative to the component"
msgstr "La position Y du texte relativement au composant"
......@@ -8048,7 +7335,7 @@ msgid ""
"Set position and style of fields and component orientation to default lib value.\n"
"Fields texts are not modified."
msgstr ""
"Ajuster la position et le style des champss et l'orientation du componsant aux valeurs par défaut en librairie.\n"
"Ajuster la position et le style des champs et l'orientation du componsant aux valeurs par défaut en librairie.\n"
"Les textes des champs ne sont pas modifiés."
#: eeschema/tool_sch.cpp:39
......@@ -8168,9 +7455,6 @@ msgid "Root"
msgstr "Racine"
#: eeschema/affiche.cpp:23
#: eeschema/dialog_create_component.cpp:149
#: eeschema/dialog_edit_libentry_fields_in_lib.cpp:151
#: eeschema/dialog_edit_component_in_schematic.cpp:86
msgid "Name"
msgstr "Nom"
......@@ -8203,7 +7487,6 @@ msgid "PinName"
msgstr "Nom Pin"
#: eeschema/affiche.cpp:81
#: eeschema/eelayer.h:140
msgid "PinNum"
msgstr "Num Pin"
......@@ -8223,7 +7506,6 @@ msgstr "oui"
#: eeschema/affiche.cpp:177
#: eeschema/affiche.cpp:183
#: eeschema/dialog_print_using_printer_base.cpp:52
msgid "All"
msgstr "Tout"
......@@ -8240,12 +7522,10 @@ msgid "Number of units:"
msgstr "Nombre de Parts:"
#: eeschema/dialog_edit_component_in_lib.cpp:152
#: eeschema/dialog_create_component.cpp:251
msgid "Skew:"
msgstr "Décalage:"
#: eeschema/dialog_edit_component_in_lib.cpp:158
#: eeschema/dialog_create_component.cpp:176
msgid "Power symbol"
msgstr "Symbole alimentation"
......@@ -8295,7 +7575,6 @@ msgstr "Eeschema est en cours d'exécution. Continuer ?"
#: eeschema/netlist_control.cpp:131
#: eeschema/netlist_control.cpp:253
#: gerbview/options.cpp:214
msgid "Default format"
msgstr "Format par défaut"
......@@ -8317,7 +7596,6 @@ msgstr "&Supprimer"
#: eeschema/netlist_control.cpp:175
#: eeschema/netlist_control.cpp:273
#: cvpcb/cvframe.cpp:403
msgid "Netlist"
msgstr "Netliste"
......@@ -8350,7 +7628,6 @@ msgid "Netlist command:"
msgstr "Commande netliste:"
#: eeschema/netlist_control.cpp:338
#: share/setpage.cpp:347
msgid "Title:"
msgstr "Titre:"
......@@ -8716,7 +7993,6 @@ msgid "Move Text "
msgstr "Déplacer Texte"
#: eeschema/libedit_onrightclick.cpp:126
#: eeschema/dialog_edit_label_base.h:59
msgid "Text Editor"
msgstr "Editeur de Texte"
......@@ -9121,14 +8397,10 @@ msgid " Default Path for libraries"
msgstr "Chemin par défaut des librairies"
#: eeschema/eeconfig.cpp:65
#: cvpcb/menucfg.cpp:155
msgid "Read config file"
msgstr "Lire config"
#: eeschema/eeconfig.cpp:78
#: kicad/files-io.cpp:132
#: gerbview/dcode.cpp:289
#: gerbview/readgerb.cpp:146
msgid "File "
msgstr "Fichier "
......@@ -9174,7 +8446,6 @@ msgstr ""
"#End List\n"
#: eeschema/build_BOM.cpp:627
#: eeschema/class_libentry_fields.cpp:140
msgid "Field"
msgstr "Champ"
......@@ -9219,7 +8490,6 @@ msgid "#End labels\n"
msgstr "#End labels\n"
#: eeschema/eeredraw.cpp:130
#: eeschema/eelayer.h:171
msgid "Sheet"
msgstr "Feuille"
......@@ -9399,10 +8669,6 @@ msgstr "Aspect Texte:"
#: eeschema/dialog_edit_libentry_fields_in_lib.cpp:160
#: eeschema/dialog_edit_libentry_fields_in_lib.cpp:165
#: eeschema/dialog_edit_component_in_schematic.cpp:95
#: eeschema/dialog_edit_component_in_schematic.cpp:100
#: common/wxwineda.cpp:220
#: common/wxwineda.cpp:233
msgid "Pos "
msgstr "Pos "
......@@ -9536,11 +8802,11 @@ msgstr "> erreur lecture entête"
msgid "%8.8lX/"
msgstr "%8.8lX/"
#: eeschema/dialog_edit_component_in_schematic.cpp:165
#: eeschema/dialog_edit_component_in_schematic.cpp:171
msgid "No Component Name!"
msgstr "Pas de nom de composant!"
#: eeschema/dialog_edit_component_in_schematic.cpp:172
#: eeschema/dialog_edit_component_in_schematic.cpp:178
#, c-format
msgid "Component [%s] not found!"
msgstr "Composant [%s] non trouvé!"
......@@ -9727,7 +8993,6 @@ msgid "Equiv"
msgstr "Equiv"
#: cvpcb/genorcad.cpp:134
#: cvpcb/writenetlistpcbnew.cpp:187
#, c-format
msgid "%s %s pin %s : Different Nets"
msgstr "%s %s pin %s : Nets Differents"
......@@ -9823,7 +9088,6 @@ msgstr "Au sujet de Cvpcb, schématique vers pcb interface"
#: cvpcb/init.cpp:73
#: cvpcb/init.cpp:128
#: cvpcb/cvframe.cpp:381
#, c-format
msgid "Components: %d (free: %d)"
msgstr "Composants: %d (libres: %d)"
......@@ -9860,7 +9124,6 @@ msgid "Component %s: Footprint %s not found in libraries"
msgstr "Composant %s: Module %s non trouvé en librairies"
#: cvpcb/displayframe.cpp:121
#: cvpcb/dialog_display_options.h:51
msgid "Display Options"
msgstr "Options d'Affichage"
......@@ -9898,22 +9161,18 @@ msgid "Delete selections"
msgstr "Effacement des associations existantes"
#: cvpcb/cvframe.cpp:461
#: common/drawframe.cpp:123
msgid "Dialog boxes"
msgstr "Fenêtres de dialogue"
#: cvpcb/cvframe.cpp:466
#: common/drawframe.cpp:128
msgid "Lists"
msgstr "Listes"
#: cvpcb/cvframe.cpp:471
#: common/drawframe.cpp:133
msgid "Status box"
msgstr "Fenêtre d'état"
#: cvpcb/cvframe.cpp:477
#: common/drawframe.cpp:139
msgid "&Font"
msgstr "&Fonte"
......@@ -9986,7 +9245,6 @@ msgid "&Apply"
msgstr "&Appliquer"
#: kicad/kicad.cpp:388
#: kicad/treeprj_frame.cpp:534
msgid "noname"
msgstr "noname"
......@@ -10233,7 +9491,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:105
#: common/gestfich.cpp:675
msgid "Prefered Editor:"
msgstr "Editeur préféré:"
......@@ -10750,10 +10007,6 @@ msgstr "Effacement Bloc (ctrl + drag souris)"
msgid "Delete Dcode items"
msgstr "Suppression d'éléments par DCode"
#: common/confirm.cpp:106
msgid "Infos:"
msgstr "Infos:"
#: common/selcolor.cpp:76
msgid "Colors"
msgstr "Couleurs"
......@@ -10957,15 +10210,15 @@ msgstr "Sélection Grille"
msgid "Grid: "
msgstr "Grille: "
#: common/gestfich.cpp:669
#: common/gestfich.cpp:671
msgid "No default editor found, you must choose it"
msgstr "Pas d'éditeur par défaut trouvé, vous devez en choisir un"
#: common/gestfich.cpp:776
#: common/gestfich.cpp:778
msgid "Problem while running the PDF viewer"
msgstr "Problème en lançant le Visualisateur PDF"
#: common/gestfich.cpp:777
#: common/gestfich.cpp:779
msgid ""
"\n"
" command is "
......@@ -10973,7 +10226,7 @@ msgstr ""
"\n"
" la commande est "
#: common/gestfich.cpp:783
#: common/gestfich.cpp:785
msgid "Unable to find a PDF viewer for"
msgstr "Impossible de trouver un visualisateur PDF pour"
......@@ -11448,7 +10701,6 @@ msgid "Footprints Orientation"
msgstr "Orientation des Modules"
#: pcbnew/dialog_setup_libs.h:43
#: eeschema/dialog_eeschema_config.h:50
msgid "Dialog"
msgstr "Dialog"
......@@ -11465,16 +10717,15 @@ msgid "Tracks and Vias Sizes"
msgstr "Dims Pistes et Vias"
#: pcbnew/dialog_SVG_print_base.h:68
#: eeschema/dialog_SVG_print_base.h:65
msgid "Create SVG file"
msgstr "Créer Fichier SVG"
#: pcbnew/drc_stuff.h:147
#: pcbnew/drc_stuff.h:149
#, c-format
msgid "ErrType(%d): <b>%s</b><ul><li> %s: %s </li><li> %s: %s </li></ul>"
msgstr "Type Err(%d): <b>%s</b><ul><li> %s: %s </li><li> %s: %s </li></ul>"
#: pcbnew/drc_stuff.h:155
#: pcbnew/drc_stuff.h:157
#, c-format
msgid "ErrType(%d): <b>%s</b><ul><li> %s: %s </li></ul>"
msgstr "Type Err (%d): <b>%s</b><ul><li> %s: %s </li></ul>"
......@@ -11507,6 +10758,10 @@ msgstr "Couches Cuivre."
msgid "Tech Layers"
msgstr "Couches Tech."
#: pcbnew/set_color.h:327
msgid "Others"
msgstr "Autres"
#: pcbnew/set_color.h:357
msgid "Ratsnest"
msgstr "Chevelu"
......@@ -11847,10 +11102,6 @@ msgstr "Couche 31"
msgid "Layer 32"
msgstr "Couche 32"
#: gerbview/set_color.h:318
msgid "Others"
msgstr "Autres"
#: gerbview/set_color.h:332
msgid "D codes id."
msgstr "DCodes id."
......
pcbnew/class_pad_draw_functions.cpp
View file @ 2eaa28f0
......@@ -163,6 +163,17 @@ void D_PAD::Draw( WinEDA_DrawPanel* panel, wxDC* DC, int draw_mode, const wxPoin
}
}
// if Contrast mode and a technical layer active, show pads on this layer
// so we can see pads on paste or solder layer
if( DisplayOpt.ContrastModeDisplay && screen->m_Active_Layer > LAST_COPPER_LAYER )
{
if( IsOnLayer( screen->m_Active_Layer ) )
color = g_DesignSettings.m_LayerColor[screen->m_Active_Layer];
else
color = DARKDARKGRAY;
}
if( draw_mode & GR_SURBRILL )
{
if( draw_mode & GR_AND )
......@@ -205,12 +216,12 @@ void D_PAD::Draw( WinEDA_DrawPanel* panel, wxDC* DC, int draw_mode, const wxPoin
if( DisplayIsol )
{
GRCircle( &panel->m_ClipBox,
DC,
xc,
yc,
dx + g_DesignSettings.m_TrackClearence,
0,
color );
DC,
xc,
yc,
dx + g_DesignSettings.m_TrackClearence,
0,
color );
}
break;
......@@ -233,14 +244,14 @@ void D_PAD::Draw( WinEDA_DrawPanel* panel, wxDC* DC, int draw_mode, const wxPoin
if( fillpad )
{
GRFillCSegm( &panel->m_ClipBox, DC, ux0 + delta_cx, uy0 + delta_cy,
ux0 - delta_cx, uy0 - delta_cy,
rotdx, color );
ux0 - delta_cx, uy0 - delta_cy,
rotdx, color );
}
else
{
GRCSegm( &panel->m_ClipBox, DC, ux0 + delta_cx, uy0 + delta_cy,
ux0 - delta_cx, uy0 - delta_cy,
rotdx, color );
ux0 - delta_cx, uy0 - delta_cy,
rotdx, color );
}
/* Trace de la marge d'isolement */
......@@ -249,8 +260,8 @@ void D_PAD::Draw( WinEDA_DrawPanel* panel, wxDC* DC, int draw_mode, const wxPoin
rotdx = rotdx + g_DesignSettings.m_TrackClearence + g_DesignSettings.m_TrackClearence;
GRCSegm( &panel->m_ClipBox, DC, ux0 + delta_cx, uy0 + delta_cy,
ux0 - delta_cx, uy0 - delta_cy,
rotdx, color );
ux0 - delta_cx, uy0 - delta_cy,
rotdx, color );
}
break;
......@@ -363,8 +374,8 @@ void D_PAD::Draw( WinEDA_DrawPanel* panel, wxDC* DC, int draw_mode, const wxPoin
RotatePoint( &delta_cx, &delta_cy, angle );
GRFillCSegm( &panel->m_ClipBox, DC, cx0 + delta_cx, cy0 + delta_cy,
cx0 - delta_cx, cy0 - delta_cy,
rotdx, color );
cx0 - delta_cx, cy0 - delta_cy,
rotdx, color );
break;
default:
......@@ -385,21 +396,31 @@ void D_PAD::Draw( WinEDA_DrawPanel* panel, wxDC* DC, int draw_mode, const wxPoin
if( m_Masque_Layer & CMP_LAYER ) /* Trace forme \ */
GRLine( &panel->m_ClipBox, DC, cx0 - dx0, cy0 - dx0,
cx0 + dx0, cy0 + dx0, 0, nc_color );
cx0 + dx0, cy0 + dx0, 0, nc_color );
if( m_Masque_Layer & CUIVRE_LAYER ) /* Trace forme / */
GRLine( &panel->m_ClipBox, DC, cx0 + dx0, cy0 - dx0,
cx0 - dx0, cy0 + dx0, 0, nc_color );
cx0 - dx0, cy0 + dx0, 0, nc_color );
}
/* Draw the pad number */
bool display_padnum = true;
if( frame && !frame->m_DisplayPadNum )
display_padnum = false;
bool display_netname = true;
if( (DisplayOpt.DisplayNetNamesMode == 0) || (DisplayOpt.DisplayNetNamesMode == 2) )
display_netname = false;
if( !display_padnum && !display_netname )
return;
wxPoint tpos0 = wxPoint( ux0, uy0 ); // Position of the centre of text
wxPoint tpos = tpos0;
wxSize AreaSize; // size of text area, normalized to AreaSize.y < AreaSize.x
int shortname_len = m_ShortNetname.Len();
int shortname_len = m_ShortNetname.Len();
if( ! display_netname )
shortname_len = 0;
if( GetShape() == PAD_CIRCLE )
angle = 0;
AreaSize = m_Size;
......@@ -410,7 +431,7 @@ void D_PAD::Draw( WinEDA_DrawPanel* panel, wxDC* DC, int draw_mode, const wxPoin
AreaSize.y = m_Size.x;
}
if( shortname_len > 0 ) // if there is a netname, provides room to display this netname
if( shortname_len > 0 ) // if there is a netname, provides room to display this netname
{
AreaSize.y /= 2; // Text used only the upper area of the pad. The lower area displays the net name
tpos.y -= AreaSize.y / 2;
......@@ -424,42 +445,48 @@ void D_PAD::Draw( WinEDA_DrawPanel* panel, wxDC* DC, int draw_mode, const wxPoin
NORMALIZE_ANGLE_90( t_angle );
/* Note: in next calculations, texte size is calculated for 3 or more chars.
Of course, pads numbers and nets names can have less than 3 chars.
but after some tries, i found this is gives the best look
*/
* Of course, pads numbers and nets names can have less than 3 chars.
* but after some tries, i found this is gives the best look
*/
#define MIN_CHAR_COUNT 3
wxString buffer;
ReturnStringPadName( buffer );
int numpad_len = buffer.Len();
numpad_len = MAX( numpad_len, MIN_CHAR_COUNT);
int tsize = min( AreaSize.y, AreaSize.x / numpad_len );
#define CHAR_SIZE_MIN 5
if( screen->Scale( tsize ) >= CHAR_SIZE_MIN ) // Not drawable when size too small.
int tsize;
if( display_padnum )
{
tsize = (int) (tsize * 0.8); // reserve room for marges and segments thickness
ReturnStringPadName( buffer );
int numpad_len = buffer.Len();
numpad_len = MAX( numpad_len, MIN_CHAR_COUNT );
DrawGraphicText( panel, DC, tpos,
WHITE, buffer, t_angle, wxSize( tsize, tsize ),
GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_VJUSTIFY_CENTER, tsize / 7 );
tsize = min( AreaSize.y, AreaSize.x / numpad_len );
#define CHAR_SIZE_MIN 5
if( screen->Scale( tsize ) >= CHAR_SIZE_MIN ) // Not drawable when size too small.
{
tsize = (int) (tsize * 0.8); // reserve room for marges and segments thickness
DrawGraphicText( panel, DC, tpos,
WHITE, buffer, t_angle, wxSize( tsize, tsize ),
GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_VJUSTIFY_CENTER, tsize / 7 );
}
}
// display the short netnam, if exists
if (shortname_len == 0 )
// display the short netname, if exists
if( shortname_len == 0 )
return;
shortname_len = MAX( shortname_len, MIN_CHAR_COUNT);
shortname_len = MAX( shortname_len, MIN_CHAR_COUNT );
tsize = min( AreaSize.y, AreaSize.x / shortname_len );
if( screen->Scale( tsize ) >= CHAR_SIZE_MIN ) // Not drawable in size too small.
{
tpos = tpos0;
tpos.y += AreaSize.y / 2;
if ( display_padnum )
tpos.y += AreaSize.y / 2;
RotatePoint( &tpos, wxPoint( ux0, uy0 ), angle );
tsize = (int) (tsize * 0.8); // reserve room for marges and segments thickness
DrawGraphicText( panel, DC, tpos,
WHITE, m_ShortNetname, t_angle, wxSize( tsize, tsize ),
GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_VJUSTIFY_CENTER, tsize / 7 );
WHITE, m_ShortNetname, t_angle, wxSize( tsize, tsize ),
GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_VJUSTIFY_CENTER, tsize / 7 );
}
}
pcbnew/class_track.cpp
View file @ 2eaa28f0
......@@ -650,6 +650,9 @@ void TRACK::Draw( WinEDA_DrawPanel* panel, wxDC* DC, int draw_mode, const wxPoin
if( Type() == TYPE_ZONE )
return;
if ( DisplayOpt.DisplayNetNamesMode == 0 || DisplayOpt.DisplayNetNamesMode == 1 )
return;
#define THRESHOLD 10
if( (m_End.x - m_Start.x) != 0 && (m_End.y - m_Start.y) != 0 )
return;
......@@ -821,6 +824,8 @@ void SEGVIA::Draw( WinEDA_DrawPanel* panel, wxDC* DC, int draw_mode, const wxPoi
// Display the short netname:
if( GetNet() == 0 )
return;
if ( DisplayOpt.DisplayNetNamesMode == 0 || DisplayOpt.DisplayNetNamesMode == 1 )
return;
EQUIPOT* net = ( (BOARD*) GetParent() )->FindNet( GetNet() );
if( net == NULL )
return;
......
pcbnew/classpcb.cpp
View file @ 2eaa28f0
......@@ -146,9 +146,13 @@ DISPLAY_OPTIONS::DISPLAY_OPTIONS()
m_DisplayViaMode = VIA_HOLE_NOT_SHOW;
DisplayPolarCood = TRUE;
DisplayZonesMode = 0; // 0 = Show filled areas outlines in zones,
// 1 = do not show filled areas outlines
// 2 = show outlines of filled areas
DisplayZonesMode = 0; /* 0 = Show filled areas outlines in zones,
* 1 = do not show filled areas outlines
* 2 = show outlines of filled areas */
DisplayNetNamesMode = 3; /* 0 do not show netnames,
* 1 show netnames on pads
* 2 show netnames on tracks
* 3 show netnames on tracks and pads */
Show_Modules_Cmp = TRUE;
Show_Modules_Cu = TRUE;
......
pcbnew/dialog_display_options_base.cpp
View file @ 2eaa28f0
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Feb 8 2009)
// C++ code generated with wxFormBuilder (version Apr 16 2008)
// http://www.wxformbuilder.org/
//
// PLEASE DO "NOT" EDIT THIS FILE!
......@@ -22,25 +22,44 @@ DialogDisplayOptions_base::DialogDisplayOptions_base( wxWindow* parent, wxWindow
wxString m_OptDisplayTracksChoices[] = { _("Sketch"), _("Filled") };
int m_OptDisplayTracksNChoices = sizeof( m_OptDisplayTracksChoices ) / sizeof( wxString );
m_OptDisplayTracks = new wxRadioBox( this, wxID_DISPLAY_TRACK, _("Tracks:"), wxDefaultPosition, wxDefaultSize, m_OptDisplayTracksNChoices, m_OptDisplayTracksChoices, 1, wxRA_SPECIFY_COLS );
m_OptDisplayTracks->SetSelection( 0 );
m_OptDisplayTracks->SetSelection( 1 );
m_OptDisplayTracks->SetToolTip( _("Select how tracks are displayed") );
sLeftBoxSizer->Add( m_OptDisplayTracks, 0, wxALL|wxEXPAND, 5 );
wxString m_OptDisplayTracksClearanceChoices[] = { _("Always"), _("New track"), _("Never") };
int m_OptDisplayTracksClearanceNChoices = sizeof( m_OptDisplayTracksClearanceChoices ) / sizeof( wxString );
m_OptDisplayTracksClearance = new wxRadioBox( this, ID_SHOW_CLEARANCE, _("Show Tracks Clearance:"), wxDefaultPosition, wxDefaultSize, m_OptDisplayTracksClearanceNChoices, m_OptDisplayTracksClearanceChoices, 1, wxRA_SPECIFY_COLS );
m_OptDisplayTracksClearance->SetSelection( 1 );
m_OptDisplayTracksClearance->SetToolTip( _("Show( or not) tracks clearance area.\nIf New track is selected, track clearance area is shown only when creating the track.") );
sLeftBoxSizer->Add( m_OptDisplayTracksClearance, 0, wxALL|wxEXPAND, 5 );
wxString m_OptDisplayViaHoleChoices[] = { _("Never"), _("defined holes"), _("Always") };
wxString m_OptDisplayViaHoleChoices[] = { _("Never"), _("Defined Holes"), _("Always") };
int m_OptDisplayViaHoleNChoices = sizeof( m_OptDisplayViaHoleChoices ) / sizeof( wxString );
m_OptDisplayViaHole = new wxRadioBox( this, ID_VIAS_HOLES, _("Show Via Holes:"), wxDefaultPosition, wxDefaultSize, m_OptDisplayViaHoleNChoices, m_OptDisplayViaHoleChoices, 1, wxRA_SPECIFY_COLS );
m_OptDisplayViaHole->SetSelection( 1 );
m_OptDisplayViaHole->SetToolTip( _("Show (or not) via holes.\nIf Defined Holes is selected, only the non default size holes are shown") );
sLeftBoxSizer->Add( m_OptDisplayViaHole, 0, wxALL|wxEXPAND, 5 );
bMainSizer->Add( sLeftBoxSizer, 0, wxEXPAND, 5 );
bMainSizer->Add( sLeftBoxSizer, 0, wxEXPAND|wxALL, 5 );
wxStaticBoxSizer* sbMiddleLeftSizer;
sbMiddleLeftSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Net Names:") ), wxVERTICAL );
wxString m_ShowNetNamesOptionChoices[] = { _("Do Not Show"), _("On Pads"), _("OnTracks"), _("On Pads and Tracks") };
int m_ShowNetNamesOptionNChoices = sizeof( m_ShowNetNamesOptionChoices ) / sizeof( wxString );
m_ShowNetNamesOption = new wxRadioBox( this, wxID_ANY, _("Show Net Names:"), wxDefaultPosition, wxDefaultSize, m_ShowNetNamesOptionNChoices, m_ShowNetNamesOptionChoices, 1, wxRA_SPECIFY_COLS );
m_ShowNetNamesOption->SetSelection( 3 );
m_ShowNetNamesOption->SetToolTip( _("Show or not net names on pads and/or tracks") );
wxStaticBoxSizer* sMiddleSizer;
sMiddleSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Footprints:") ), wxHORIZONTAL );
sbMiddleLeftSizer->Add( m_ShowNetNamesOption, 0, wxALL, 5 );
bMainSizer->Add( sbMiddleLeftSizer, 0, wxALL|wxEXPAND, 5 );
wxStaticBoxSizer* sMiddleRightSizer;
sMiddleRightSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Footprints:") ), wxHORIZONTAL );
wxBoxSizer* bLModuleSizer;
bLModuleSizer = new wxBoxSizer( wxVERTICAL );
......@@ -57,7 +76,7 @@ DialogDisplayOptions_base::DialogDisplayOptions_base( wxWindow* parent, wxWindow
m_OptDisplayModTexts->SetSelection( 1 );
bLModuleSizer->Add( m_OptDisplayModTexts, 0, wxALL|wxEXPAND, 5 );
sMiddleSizer->Add( bLModuleSizer, 0, 0, 5 );
sMiddleRightSizer->Add( bLModuleSizer, 0, 0, 5 );
wxStaticBoxSizer* bRModuleSizer;
bRModuleSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Pad Options:") ), wxVERTICAL );
......@@ -69,19 +88,22 @@ DialogDisplayOptions_base::DialogDisplayOptions_base( wxWindow* parent, wxWindow
bRModuleSizer->Add( m_OptDisplayPads, 0, wxALL|wxEXPAND, 5 );
m_OptDisplayPadClearence = new wxCheckBox( this, wxID_ANY, _("Show Pad Clearance"), wxDefaultPosition, wxDefaultSize, 0 );
bRModuleSizer->Add( m_OptDisplayPadClearence, 0, wxALL, 5 );
m_OptDisplayPadNumber = new wxCheckBox( this, wxID_ANY, _("Show Pad Number"), wxDefaultPosition, wxDefaultSize, 0 );
m_OptDisplayPadNumber->SetValue(true);
m_OptDisplayPadNumber->SetValue(true);
bRModuleSizer->Add( m_OptDisplayPadNumber, 0, wxALL, 5 );
m_OptDisplayPadNoConn = new wxCheckBox( this, wxID_ANY, _("Show Pad NoConnect"), wxDefaultPosition, wxDefaultSize, 0 );
m_OptDisplayPadNoConn->SetValue(true);
m_OptDisplayPadNoConn->SetValue(true);
bRModuleSizer->Add( m_OptDisplayPadNoConn, 0, wxALL, 5 );
sMiddleSizer->Add( bRModuleSizer, 0, 0, 5 );
sMiddleRightSizer->Add( bRModuleSizer, 0, 0, 5 );
bMainSizer->Add( sMiddleSizer, 0, wxEXPAND, 5 );
bMainSizer->Add( sMiddleRightSizer, 0, wxEXPAND|wxALL, 5 );
wxBoxSizer* bRightSizer;
bRightSizer = new wxBoxSizer( wxVERTICAL );
......@@ -116,7 +138,7 @@ DialogDisplayOptions_base::DialogDisplayOptions_base( wxWindow* parent, wxWindow
bRightSizer->Add( m_buttonCANCEL, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
bMainSizer->Add( bRightSizer, 0, wxEXPAND, 5 );
bMainSizer->Add( bRightSizer, 0, wxEXPAND|wxALL, 5 );
this->SetSizer( bMainSizer );
this->Layout();
......
pcbnew/dialog_display_options_base.fbp
View file @ 2eaa28f0
......@@ -7,7 +7,6 @@
<property name="disconnect_events">1</property>
<property name="encoding">UTF-8</property>
<property name="event_generation">connect</property>
<property name="event_handler">impl_virtual</property>
<property name="file">dialog_display_options_base</property>
<property name="first_id">1000</property>
<property name="help_provider">none</property>
......@@ -33,15 +32,11 @@
<property name="minimum_size"></property>
<property name="name">DialogDisplayOptions_base</property>
<property name="pos"></property>
<property name="size">559,303</property>
<property name="size">731,331</property>
<property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property>
<property name="subclass"></property>
<property name="title"></property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
......@@ -82,7 +77,7 @@
<property name="permission">none</property>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxEXPAND</property>
<property name="flag">wxEXPAND|wxALL</property>
<property name="proportion">0</property>
<object class="wxStaticBoxSizer" expanded="1">
<property name="id">wxID_ANY</property>
......@@ -112,15 +107,11 @@
<property name="name">m_OptDisplayTracks</property>
<property name="permission">protected</property>
<property name="pos"></property>
<property name="selection">0</property>
<property name="selection">1</property>
<property name="size"></property>
<property name="style">wxRA_SPECIFY_COLS</property>
<property name="subclass"></property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="tooltip">Select how tracks are displayed</property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
......@@ -174,11 +165,7 @@
<property name="size"></property>
<property name="style">wxRA_SPECIFY_COLS</property>
<property name="subclass"></property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="tooltip">Show( or not) tracks clearance area.&#x0A;If New track is selected, track clearance area is shown only when creating the track.</property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
......@@ -214,7 +201,7 @@
<property name="proportion">0</property>
<object class="wxRadioBox" expanded="1">
<property name="bg"></property>
<property name="choices">&quot;Never&quot; &quot;defined holes&quot; &quot;Always&quot;</property>
<property name="choices">&quot;Never&quot; &quot;Defined Holes&quot; &quot;Always&quot;</property>
<property name="context_help"></property>
<property name="enabled">1</property>
<property name="fg"></property>
......@@ -232,11 +219,75 @@
<property name="size"></property>
<property name="style">wxRA_SPECIFY_COLS</property>
<property name="subclass"></property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="tooltip">Show (or not) via holes.&#x0A;If Defined Holes is selected, only the non default size holes are shown</property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnChar"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRadioBox"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
</object>
</object>
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALL|wxEXPAND</property>
<property name="proportion">0</property>
<object class="wxStaticBoxSizer" expanded="1">
<property name="id">wxID_ANY</property>
<property name="label">Net Names:</property>
<property name="minimum_size"></property>
<property name="name">sbMiddleLeftSizer</property>
<property name="orient">wxVERTICAL</property>
<property name="permission">none</property>
<event name="OnUpdateUI"></event>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALL</property>
<property name="proportion">0</property>
<object class="wxRadioBox" expanded="1">
<property name="bg"></property>
<property name="choices">&quot;Do Not Show&quot; &quot;On Pads&quot; &quot;OnTracks&quot; &quot;On Pads and Tracks&quot;</property>
<property name="context_help"></property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="font"></property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Show Net Names:</property>
<property name="majorDimension">1</property>
<property name="maximum_size"></property>
<property name="minimum_size"></property>
<property name="name">m_ShowNetNamesOption</property>
<property name="permission">protected</property>
<property name="pos"></property>
<property name="selection">3</property>
<property name="size"></property>
<property name="style">wxRA_SPECIFY_COLS</property>
<property name="subclass"></property>
<property name="tooltip">Show or not net names on pads and/or tracks</property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
......@@ -270,13 +321,13 @@
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxEXPAND</property>
<property name="flag">wxEXPAND|wxALL</property>
<property name="proportion">0</property>
<object class="wxStaticBoxSizer" expanded="1">
<property name="id">wxID_ANY</property>
<property name="label">Footprints:</property>
<property name="minimum_size"></property>
<property name="name">sMiddleSizer</property>
<property name="name">sMiddleRightSizer</property>
<property name="orient">wxHORIZONTAL</property>
<property name="permission">none</property>
<event name="OnUpdateUI"></event>
......@@ -314,10 +365,6 @@
<property name="style">wxRA_SPECIFY_COLS</property>
<property name="subclass"></property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
......@@ -372,10 +419,6 @@
<property name="style">wxRA_SPECIFY_COLS</property>
<property name="subclass"></property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
......@@ -444,10 +487,6 @@
<property name="style">wxRA_SPECIFY_COLS</property>
<property name="subclass"></property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
......@@ -500,10 +539,6 @@
<property name="style"></property>
<property name="subclass"></property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
......@@ -556,10 +591,6 @@
<property name="style"></property>
<property name="subclass"></property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
......@@ -612,10 +643,6 @@
<property name="style"></property>
<property name="subclass"></property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
......@@ -651,7 +678,7 @@
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxEXPAND</property>
<property name="flag">wxEXPAND|wxALL</property>
<property name="proportion">0</property>
<object class="wxBoxSizer" expanded="1">
<property name="minimum_size"></property>
......@@ -695,10 +722,6 @@
<property name="style">wxRA_SPECIFY_COLS</property>
<property name="subclass"></property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
......@@ -753,10 +776,6 @@
<property name="style">wxRA_SPECIFY_COLS</property>
<property name="subclass"></property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
......@@ -821,10 +840,6 @@
<property name="style"></property>
<property name="subclass"></property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
......@@ -877,10 +892,6 @@
<property name="style"></property>
<property name="subclass"></property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
......
pcbnew/dialog_display_options_base.h
View file @ 2eaa28f0
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Feb 8 2009)
// C++ code generated with wxFormBuilder (version Apr 16 2008)
// http://www.wxformbuilder.org/
//
// PLEASE DO "NOT" EDIT THIS FILE!
......@@ -45,6 +45,7 @@ class DialogDisplayOptions_base : public wxDialog
wxRadioBox* m_OptDisplayTracks;
wxRadioBox* m_OptDisplayTracksClearance;
wxRadioBox* m_OptDisplayViaHole;
wxRadioBox* m_ShowNetNamesOption;
wxRadioBox* m_OptDisplayModEdges;
wxRadioBox* m_OptDisplayModTexts;
wxRadioBox* m_OptDisplayPads;
......@@ -58,13 +59,12 @@ class DialogDisplayOptions_base : public wxDialog
wxButton* m_buttonCANCEL;
// Virtual event handlers, overide them in your derived class
virtual void OnOkClick( wxCommandEvent& event ) { event.Skip(); }
virtual void OnCancelClick( wxCommandEvent& event ) { event.Skip(); }
virtual void OnOkClick( wxCommandEvent& event ){ event.Skip(); }
virtual void OnCancelClick( wxCommandEvent& event ){ event.Skip(); }
public:
DialogDisplayOptions_base( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 559,303 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
DialogDisplayOptions_base( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 731,331 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
~DialogDisplayOptions_base();
};
......
pcbnew/dialog_general_options.cpp
View file @ 2eaa28f0
......@@ -165,6 +165,7 @@ void Dialog_Display_Options::init()
m_OptDisplayPadNumber->SetValue( DisplayOpt.DisplayPadNum );
m_OptDisplayPadNoConn->SetValue( DisplayOpt.DisplayPadNoConn );
m_OptDisplayDrawings->SetSelection( DisplayOpt.DisplayDrawItems );
m_ShowNetNamesOption->SetSelection( DisplayOpt.DisplayNetNamesMode);
if( GetSizer() )
{
......@@ -229,6 +230,8 @@ void Dialog_Display_Options::OnOkClick(wxCommandEvent& event)
DisplayOpt.DisplayPadNoConn = m_OptDisplayPadNoConn->GetValue();
DisplayOpt.DisplayDrawItems = m_OptDisplayDrawings->GetSelection();
DisplayOpt.DisplayNetNamesMode = m_ShowNetNamesOption->GetSelection();
m_Parent->DrawPanel->Refresh(TRUE);
......
pcbnew/menubarpcb.cpp
View file @ 2eaa28f0
......@@ -174,8 +174,8 @@ void WinEDA_PcbFrame::ReCreateMenuBar()
item->SetBitmap( library_xpm );
configmenu->Append( item );
item = new wxMenuItem( configmenu, ID_COLORS_SETUP, _( "&Colors" ),
_( "Select colors and display for board items" ) );
item = new wxMenuItem( configmenu, ID_COLORS_SETUP, _( "&Colors and Visibility" ),
_( "Select colors and visibilty of layers and some items" ) );
item->SetBitmap( palette_xpm );
configmenu->Append( item );
......@@ -185,7 +185,7 @@ void WinEDA_PcbFrame::ReCreateMenuBar()
configmenu->Append( item );
item = new wxMenuItem( configmenu, ID_PCB_LOOK_SETUP, _( "&Display" ),
_( "Select what items are displayed" ) );
_( "Select how items (pads, tracks texts ... ) are displayed" ) );
item->SetBitmap( display_options_xpm );
configmenu->Append( item );
......
pcbnew/pcbcfg.h
View file @ 2eaa28f0
......@@ -104,6 +104,16 @@ static PARAM_CFG_INT ViaShowHoleCfg
OPT_VIA_HOLE_END - 1 /* Min and max values*/
);
static PARAM_CFG_INT ShowNetNamesModeCfg
(
INSETUP,
wxT( "ShowNetNamesMode" ), /* Keyword */
&DisplayOpt.DisplayNetNamesMode, /* Parameter address */
3, /* Default value */
0, /* Min and max values*/
3 /* Min and max values*/
);
static PARAM_CFG_INT TrackClearenceCfg
(
wxT( "Isol" ), /* Keyword */
......@@ -227,7 +237,7 @@ static PARAM_CFG_INT AfficheContourModuleCfg // Module Edges: fill/line/sketc
INSETUP,
wxT( "ModAffC" ), /* Keyword */
&DisplayOpt.DisplayModEdge, /* Parameter address */
FILLED, /* Default value */
FILLED, /* Default value */
0, 2 /* Min and max values*/
);
......@@ -236,7 +246,7 @@ static PARAM_CFG_INT AfficheTexteModuleCfg // Module Texts: fill/line/sketch
INSETUP,
wxT( "ModAffT" ), /* Keyword */
&DisplayOpt.DisplayModText, /* Parameter address */
FILLED, /* Default value */
FILLED, /* Default value */
0, 2 /* Min and max values*/
);
......@@ -245,7 +255,7 @@ static PARAM_CFG_INT AfficheTextePcbCfg // PCB Texts: fill/line/sketch
INSETUP,
wxT( "PcbAffT" ), /* Keyword */
&DisplayOpt.DisplayDrawItems, /* Parameter address */
FILLED, /* Default value */
FILLED, /* Default value */
0, 2 /* Min and max values*/
);
......@@ -788,7 +798,7 @@ static PARAM_CFG_BOOL TwoSegmentTrackBuildCfg
/* parameters in this list will be saved on request (when saving config).
*/
*/
PARAM_CFG_BASE* ParamCfgList[] =
{
&UserLibDirBufCfg,
......@@ -802,6 +812,7 @@ PARAM_CFG_BASE* ParamCfgList[] =
&MicroViaDiametreCfg,
&MicroViaDrillCfg,
&ViaShowHoleCfg,
&ShowNetNamesModeCfg,
&TrackClearenceCfg,
&LayerCountCfg,
&TrackWidthCfg,
......
pcbnew/set_color.cpp
View file @ 2eaa28f0
......@@ -156,7 +156,7 @@ void WinEDA_SetColorsFrame::CreateControls()
MainBoxSizer->Add(FlexColumnBoxSizer, 1, wxGROW|wxLEFT|wxBOTTOM, 5);
// Add a text string to identify the controls within this column.
Label = new wxStaticText( this, wxID_STATIC, laytool_index[cln]->m_Name,
Label = new wxStaticText( this, wxID_STATIC, wxGetTranslation(laytool_index[cln]->m_Name),
wxDefaultPosition, wxDefaultSize, 0 );
// Make this text string bold (so that it stands out better).
......@@ -209,15 +209,17 @@ void WinEDA_SetColorsFrame::CreateControls()
RowBoxSizer->Add(BUTT_SIZE_X, BUTT_SIZE_Y, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxBOTTOM, 5);
}
// Note: When setting texts, we must call wxGetTranslation( ) for all statically created texts
// if we want them translated
if( laytool_list[lyr]->m_LayerNumber >= 0 )
{
if( laytool_list[lyr]->m_Title == wxT( "*" ) )
msg = g_ViaType_Name[laytool_list[lyr]->m_LayerNumber];
msg = wxGetTranslation( g_ViaType_Name[laytool_list[lyr]->m_LayerNumber]);
else
msg = m_Parent->GetBoard()->GetLayerName( laytool_list[lyr]->m_LayerNumber );
}
else
msg = wxGetTranslation( laytool_list[lyr]->m_Title.GetData() );
msg = wxGetTranslation( laytool_list[lyr]->m_Title );
CheckBox = new wxCheckBox( this, ID_COLOR_CHECKBOX_ONOFF, msg,
wxDefaultPosition, wxDefaultSize, wxCHK_2STATE );
......
pcbnew/set_color.h
View file @ 2eaa28f0
......@@ -324,7 +324,7 @@ static ColorButton Layer_29_Butt =
static ButtonIndex Msg_Others_Items =
{
wxT( "Others" ), // Title
_( "Others" ), // Title
43 // Index to last bitmap button in group
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment