From 2eaa28f0cb0dc1f1e64e99c313e7f6ccf8ebf947 Mon Sep 17 00:00:00 2001 From: charras Date: Thu, 26 Mar 2009 19:27:50 +0000 Subject: [PATCH] Pcbnew: some enhancements --- CHANGELOG.txt | 2 +- common/gr_basic.cpp | 12 +- include/build_version.h | 2 +- include/pcbstruct.h | 6 + internat/fr/kicad.mo | Bin 176114 -> 177483 bytes internat/fr/kicad.po | 995 +++---------------------- pcbnew/class_pad_draw_functions.cpp | 103 ++- pcbnew/class_track.cpp | 5 + pcbnew/classpcb.cpp | 10 +- pcbnew/dialog_display_options_base.cpp | 46 +- pcbnew/dialog_display_options_base.fbp | 145 ++-- pcbnew/dialog_display_options_base.h | 10 +- pcbnew/dialog_general_options.cpp | 3 + pcbnew/menubarpcb.cpp | 6 +- pcbnew/pcbcfg.h | 19 +- pcbnew/set_color.cpp | 8 +- pcbnew/set_color.h | 2 +- 17 files changed, 358 insertions(+), 1016 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 385ecf30c1..5da2c69d5e 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -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 +2009-mar-23 UPDATE Jean-Pierre Charras ================================================================================ ++pcbnew: in DRC: added test pads to holes. diff --git a/common/gr_basic.cpp b/common/gr_basic.cpp index 393b0ac9ab..6fcee097a0 100644 --- a/common/gr_basic.cpp +++ b/common/gr_basic.cpp @@ -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 ); } diff --git a/include/build_version.h b/include/build_version.h index 5fb4261a3e..3c837133de 100644 --- a/include/build_version.h +++ b/include/build_version.h @@ -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 diff --git a/include/pcbstruct.h b/include/pcbstruct.h index 89fcd3a533..505629e4eb 100644 --- a/include/pcbstruct.h +++ b/include/pcbstruct.h @@ -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; diff --git a/internat/fr/kicad.mo b/internat/fr/kicad.mo index 83d6f7d2832d3d3d9464e73a4348055e4339400a..d1cccfac98592ca5ff66fbd00c86d9da0857e7eb 100644 GIT binary patch delta 57997 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 Yw}^`98*S~Lu!b86jkZT_w%m6AAEzFNv;Y7A diff --git a/internat/fr/kicad.po b/internat/fr/kicad.po index d8b2708fb9..f57966fd0b 100644 --- a/internat/fr/kicad.po +++ b/internat/fr/kicad.po @@ -2,9 +2,9 @@ msgid "" msgstr "" "Project-Id-Version: kicad\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-20 08:07+0100\n" -"PO-Revision-Date: 2009-03-20 10:34+0100\n" -"Last-Translator: jp charras \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 \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): %s
  • %s: %s
  • %s: %s
" msgstr "Type Err(%d): %s
  • %s: %s
  • %s: %s
" -#: pcbnew/drc_stuff.h:155 +#: pcbnew/drc_stuff.h:157 #, c-format msgid "ErrType(%d): %s
  • %s: %s
" msgstr "Type Err (%d): %s
  • %s: %s
" @@ -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." diff --git a/pcbnew/class_pad_draw_functions.cpp b/pcbnew/class_pad_draw_functions.cpp index 90efb80c81..5fd39cd35b 100644 --- a/pcbnew/class_pad_draw_functions.cpp +++ b/pcbnew/class_pad_draw_functions.cpp @@ -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 ); } } - diff --git a/pcbnew/class_track.cpp b/pcbnew/class_track.cpp index 82cc46c6c8..06ae63728e 100644 --- a/pcbnew/class_track.cpp +++ b/pcbnew/class_track.cpp @@ -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; diff --git a/pcbnew/classpcb.cpp b/pcbnew/classpcb.cpp index fbb55a5987..3237acb252 100644 --- a/pcbnew/classpcb.cpp +++ b/pcbnew/classpcb.cpp @@ -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; diff --git a/pcbnew/dialog_display_options_base.cpp b/pcbnew/dialog_display_options_base.cpp index e28cd7f84d..8712489757 100644 --- a/pcbnew/dialog_display_options_base.cpp +++ b/pcbnew/dialog_display_options_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// 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* sMiddleSizer; - sMiddleSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Footprints:") ), wxHORIZONTAL ); + 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") ); + + 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(); diff --git a/pcbnew/dialog_display_options_base.fbp b/pcbnew/dialog_display_options_base.fbp index c734c279a9..54fd17004a 100644 --- a/pcbnew/dialog_display_options_base.fbp +++ b/pcbnew/dialog_display_options_base.fbp @@ -7,7 +7,6 @@ 1 UTF-8 connect - impl_virtual dialog_display_options_base 1000 none @@ -33,15 +32,11 @@ DialogDisplayOptions_base - 559,303 + 731,331 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER - - wxFILTER_NONE - wxDefaultValidator - @@ -82,7 +77,7 @@ none 5 - wxEXPAND + wxEXPAND|wxALL 0 wxID_ANY @@ -112,15 +107,11 @@ m_OptDisplayTracks protected - 0 + 1 wxRA_SPECIFY_COLS - - - wxFILTER_NONE - wxDefaultValidator - + Select how tracks are displayed @@ -174,11 +165,7 @@ wxRA_SPECIFY_COLS - - - wxFILTER_NONE - wxDefaultValidator - + Show( or not) tracks clearance area. If New track is selected, track clearance area is shown only when creating the track. @@ -214,7 +201,7 @@ 0 - "Never" "defined holes" "Always" + "Never" "Defined Holes" "Always" 1 @@ -232,11 +219,7 @@ wxRA_SPECIFY_COLS - - - wxFILTER_NONE - wxDefaultValidator - + Show (or not) via holes. If Defined Holes is selected, only the non default size holes are shown @@ -270,13 +253,81 @@ 5 - wxEXPAND + wxALL|wxEXPAND + 0 + + wxID_ANY + Net Names: + + sbMiddleLeftSizer + wxVERTICAL + none + + + 5 + wxALL + 0 + + + "Do Not Show" "On Pads" "OnTracks" "On Pads and Tracks" + + 1 + + + 0 + wxID_ANY + Show Net Names: + 1 + + + m_ShowNetNamesOption + protected + + 3 + + wxRA_SPECIFY_COLS + + Show or not net names on pads and/or tracks + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND|wxALL 0 wxID_ANY Footprints: - sMiddleSizer + sMiddleRightSizer wxHORIZONTAL none @@ -314,10 +365,6 @@ wxRA_SPECIFY_COLS - - wxFILTER_NONE - wxDefaultValidator - @@ -372,10 +419,6 @@ wxRA_SPECIFY_COLS - - wxFILTER_NONE - wxDefaultValidator - @@ -444,10 +487,6 @@ wxRA_SPECIFY_COLS - - wxFILTER_NONE - wxDefaultValidator - @@ -500,10 +539,6 @@ - - wxFILTER_NONE - wxDefaultValidator - @@ -556,10 +591,6 @@ - - wxFILTER_NONE - wxDefaultValidator - @@ -612,10 +643,6 @@ - - wxFILTER_NONE - wxDefaultValidator - @@ -651,7 +678,7 @@ 5 - wxEXPAND + wxEXPAND|wxALL 0 @@ -695,10 +722,6 @@ wxRA_SPECIFY_COLS - - wxFILTER_NONE - wxDefaultValidator - @@ -753,10 +776,6 @@ wxRA_SPECIFY_COLS - - wxFILTER_NONE - wxDefaultValidator - @@ -821,10 +840,6 @@ - - wxFILTER_NONE - wxDefaultValidator - @@ -877,10 +892,6 @@ - - wxFILTER_NONE - wxDefaultValidator - diff --git a/pcbnew/dialog_display_options_base.h b/pcbnew/dialog_display_options_base.h index 303f5e5a60..9bd3fa7883 100644 --- a/pcbnew/dialog_display_options_base.h +++ b/pcbnew/dialog_display_options_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// 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(); }; diff --git a/pcbnew/dialog_general_options.cpp b/pcbnew/dialog_general_options.cpp index d93a042538..c9d7dafb10 100644 --- a/pcbnew/dialog_general_options.cpp +++ b/pcbnew/dialog_general_options.cpp @@ -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); diff --git a/pcbnew/menubarpcb.cpp b/pcbnew/menubarpcb.cpp index 5a4b28e0dc..a3c53bd1d2 100644 --- a/pcbnew/menubarpcb.cpp +++ b/pcbnew/menubarpcb.cpp @@ -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 ); diff --git a/pcbnew/pcbcfg.h b/pcbnew/pcbcfg.h index 85b9e00363..3e5e2cdba4 100644 --- a/pcbnew/pcbcfg.h +++ b/pcbnew/pcbcfg.h @@ -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, diff --git a/pcbnew/set_color.cpp b/pcbnew/set_color.cpp index 62f81a5ba9..24b0aed5e0 100644 --- a/pcbnew/set_color.cpp +++ b/pcbnew/set_color.cpp @@ -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 ); diff --git a/pcbnew/set_color.h b/pcbnew/set_color.h index 5b458b4811..4aa71e7691 100644 --- a/pcbnew/set_color.h +++ b/pcbnew/set_color.h @@ -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 };