From ee68d20e58a73b9b0bca533742e14f2eb2cf55c8 Mon Sep 17 00:00:00 2001 From: CHARRAS Date: Sat, 6 Oct 2007 16:16:48 +0000 Subject: [PATCH] create new file cross-probing.cpp Move RemoteCommand() and SendMessageToEESCHEMA() to it --- change_log.txt | 7 + include/drawpanel_wxstruct.h | 15 +- include/pcbstruct.h | 19 +- internat/fr/kicad.mo | Bin 132633 -> 132104 bytes internat/fr/kicad.po | 3795 ++++++++--------- libs.win | 3 +- pcbnew/basepcbframe.cpp | 13 +- pcbnew/controle.cpp | 104 +- pcbnew/cross-probing.cpp | 185 + pcbnew/edit.cpp | 69 - pcbnew/editrack-part2.cpp | 2 +- pcbnew/makefile.include | 1 + .../win_eda_cleaningoptionsframe.cpp.notused | 220 - pcbnew/win_eda_cleaningoptionsframe.h.notused | 109 - share/drawpanel.cpp | 40 +- 15 files changed, 2113 insertions(+), 2469 deletions(-) create mode 100644 pcbnew/cross-probing.cpp delete mode 100644 pcbnew/win_eda_cleaningoptionsframe.cpp.notused delete mode 100644 pcbnew/win_eda_cleaningoptionsframe.h.notused diff --git a/change_log.txt b/change_log.txt index b76e87858b..0ed628cf6e 100644 --- a/change_log.txt +++ b/change_log.txt @@ -4,6 +4,13 @@ Started 2007-June-11 Please add newer entries at the top, list the date and your name with email address. +2007-Oct-6 UPDATE Jean-Pierre Charras +================================================================================ ++ pcbnew + create new file cross-probing.cpp + move RemoteCommand() and SendMessageToEESCHEMA() to cross-probing.cpp + + 2007-Oct-3 UPDATE Dick Hollenbeck ================================================================================ diff --git a/include/drawpanel_wxstruct.h b/include/drawpanel_wxstruct.h index 483380ed70..5b822565cb 100644 --- a/include/drawpanel_wxstruct.h +++ b/include/drawpanel_wxstruct.h @@ -26,8 +26,7 @@ class WinEDA_DrawPanel : public EDA_DRAW_PANEL public: int m_Ident; WinEDA_DrawFrame* m_Parent; - EDA_Rect m_ClipBox; /* position et taille de la fenetre de trace - * pour les "RePaint" d'ecran */ + EDA_Rect m_ClipBox; // the clipbox used in screen redraw (usually gives the visible area in internal units) wxPoint m_CursorStartPos; // utile dans controles du mouvement curseur int m_Scroll_unit; // Valeur de l'unite de scroll en pixels pour les barres de scroll int m_ScrollButt_unit; // Valeur de l'unite de scroll en pixels pour les boutons de scroll @@ -35,14 +34,14 @@ public: bool m_AbortRequest; // Flag d'arret de commandes longues bool m_AbortEnable; // TRUE si menu ou bouton Abort doit etre affiche - bool m_AutoPAN_Enable; // TRUE pour autoriser auto pan (autorisation g��ale) - bool m_AutoPAN_Request; // TRUE pour auto pan (lorsque auto pan n�essaire) + bool m_AutoPAN_Enable; // TRUE to allow auto pan + bool m_AutoPAN_Request; // TRUE to request an auto pan (will be made only if m_AutoPAN_Enable = true) - int m_IgnoreMouseEvents; ///< when non-zero, then ignore mouse events + int m_IgnoreMouseEvents; // when non-zero (true), then ignore mouse events - bool m_Block_Enable; // TRUE pour autoriser Bloc Commandes (autorisation g��ale) - int m_CanStartBlock; // >= 0 (ou >= n) si un bloc peut demarrer - // (filtrage des commandes de debut de bloc ) + bool m_Block_Enable; // TRUE to accept Block Commands + int m_CanStartBlock; // >= 0 (or >= n) if a block can start + // usefull ot avoid false start block in certain cases (like switch from a sheet to an other scheet int m_PanelDefaultCursor; // Current mouse cursor default shape id for this window int m_PanelCursor; // Current mouse cursor shape id for this window int m_CursorLevel; // Index for cursor redraw in XOR mode diff --git a/include/pcbstruct.h b/include/pcbstruct.h index 822b878544..50cbdce3de 100644 --- a/include/pcbstruct.h +++ b/include/pcbstruct.h @@ -359,13 +359,13 @@ public: class DRAWSEGMENT : public BOARD_ITEM { public: - int m_Width; // 0 = line, > 0 = tracks, bus ... + int m_Width; // 0 = line. if > 0 = tracks, bus ... wxPoint m_Start; // Line start point wxPoint m_End; // Line end point - int m_Shape; // forme: Segment , Cercle.. - int m_Type; // numero de sous type ( cotation.. ) - int m_Angle; // pour les arcs: "longueur" de l'arc en 1/10 deg + int m_Shape; // Shape: line, Circle, Arc + int m_Type; // Used in complex associations ( Dimensions.. ) + int m_Angle; // Used only for Arcs: Arc angle in 1/10 deg public: DRAWSEGMENT( BOARD_ITEM* StructFather, KICAD_T idtype = TYPEDRAWSEGMENT ); @@ -375,7 +375,7 @@ public: bool WriteDrawSegmentDescr( FILE* File ); bool ReadDrawSegmentDescr( FILE* File, int* LineNum ); - /* supprime du chainage la structure Struct */ + /* remove this from the linked list */ void UnLink(); void Copy( DRAWSEGMENT* source ); @@ -429,18 +429,17 @@ public: }; -/************************************/ -/* Gestion des marqueurs sur le PCB */ -/************************************/ +/***************************************/ +/* Markers: used to show a drc problem */ +/***************************************/ class MARQUEUR : public BOARD_ITEM { - /* Description d'un marqueur */ public: wxPoint m_Pos; char* m_Bitmap; /* Shape (bitmap) */ int m_Type; - int m_Color; /* couleur */ + int m_Color; /* color */ wxString m_Diag; /* Associated text (comment) */ public: diff --git a/internat/fr/kicad.mo b/internat/fr/kicad.mo index 377690252dbd9ca61e2d3828d3b2e0ab1d57d52f..6588feb49d56750efebe64b9af1847727b083828 100644 GIT binary patch delta 47998 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 BZ$bb7 diff --git a/internat/fr/kicad.po b/internat/fr/kicad.po index 3a8d4194f8..3d89e4e83c 100644 --- a/internat/fr/kicad.po +++ b/internat/fr/kicad.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: kicad\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2007-09-25 13:18+0100\n" +"PO-Revision-Date: 2007-10-04 15:24+0100\n" "Last-Translator: jp charras \n" "Language-Team: kicad team \n" "MIME-Version: 1.0\n" @@ -127,7 +127,7 @@ msgid "Place anchor" msgstr "Place Ancre" #: pcbnew/modedit.cpp:344 -#: pcbnew/edit.cpp:775 +#: pcbnew/edit.cpp:526 #: eeschema/schedit.cpp:454 #: eeschema/libframe.cpp:578 msgid "Delete item" @@ -153,44 +153,95 @@ msgstr "Pas de memoire pour autoroutage" msgid "Place Cells" msgstr "Place Cells" -#: pcbnew/find.cpp:140 -msgid "Marker found" -msgstr "Marqueur trouvé" +#: pcbnew/initpcb.cpp:126 +msgid "Current Board will be lost ?" +msgstr "Le C.I. courant sera perdu ?" -#: pcbnew/find.cpp:142 -#, c-format -msgid "<%s> Found" -msgstr "<%s> trouvé" +#: pcbnew/initpcb.cpp:213 +msgid "Delete Zones ?" +msgstr "Effacer Zones ?" -#: pcbnew/find.cpp:150 -msgid "Marker not found" -msgstr "Marqueur non trouvé" +#: pcbnew/initpcb.cpp:240 +msgid "Delete Board edges ?" +msgstr "Effacement contour PCB" -#: pcbnew/find.cpp:152 -#, c-format -msgid "<%s> Not Found" -msgstr "<%s> Non trouvé" +#: pcbnew/initpcb.cpp:245 +msgid "Delete draw items?" +msgstr "Suppression éléments graphiques?" -#: pcbnew/find.cpp:258 -#: eeschema/dialog_find.cpp:107 -msgid "Item to find:" -msgstr "Elément a chercher:" +#: pcbnew/initpcb.cpp:287 +#: gerbview/initpcb.cpp:152 +msgid "Delete Tracks?" +msgstr "Effacer Pistes ?" -#: pcbnew/find.cpp:279 -msgid "Find Item" -msgstr "Chercher Item" +#: pcbnew/initpcb.cpp:310 +msgid "Delete Modules?" +msgstr "Effacement des Modules?" -#: pcbnew/find.cpp:285 -msgid "Find Next Item" -msgstr "Chercher Item Suivant" +#: pcbnew/initpcb.cpp:333 +#: gerbview/initpcb.cpp:175 +msgid "Delete Pcb Texts" +msgstr "Effacer Textes Pcb" -#: pcbnew/find.cpp:294 -msgid "Find Marker" -msgstr "Chercher Marqueur" +#: pcbnew/clean.cpp:163 +msgid "Delete unconnected tracks:" +msgstr "Suppression Pistes non connectées" -#: pcbnew/find.cpp:300 -msgid "Find Next Marker" -msgstr "Marqueur Suivant" +#: pcbnew/clean.cpp:181 +msgid "ViaDef" +msgstr "ViaDef" + +#: pcbnew/clean.cpp:332 +msgid "Clean Null Segments" +msgstr "Nettoyage segments nulls" + +#: pcbnew/clean.cpp:420 +msgid "Merging Segments:" +msgstr "Associe Segment" + +#: pcbnew/clean.cpp:422 +msgid "Merge" +msgstr "Merge" + +#: pcbnew/clean.cpp:422 +#: pcbnew/dialog_pad_edit.cpp:186 +#: eeschema/dialog_erc.cpp:192 +#: eeschema/dialog_erc.cpp:196 +#: eeschema/dialog_edit_component_in_schematic.cpp:172 +msgid "0" +msgstr "0" + +#: pcbnew/clean.cpp:435 +msgid "Merge: " +msgstr "Merge: " + +#: pcbnew/clean.cpp:647 +msgid "DRC Control:" +msgstr "Controle DRC:" + +#: pcbnew/clean.cpp:652 +msgid "NetCtr" +msgstr "NetCtr" + +#: pcbnew/clean.cpp:886 +msgid "Centre" +msgstr "Centre" + +#: pcbnew/clean.cpp:886 +msgid "0 " +msgstr "0" + +#: pcbnew/clean.cpp:897 +msgid "Pads: " +msgstr "Pastilles: " + +#: pcbnew/clean.cpp:900 +msgid "Max" +msgstr "Max" + +#: pcbnew/clean.cpp:902 +msgid "Segm" +msgstr "Segm" #: pcbnew/librairi.cpp:47 msgid "Import Module:" @@ -245,9 +296,11 @@ msgstr "Librairie " #: pcbnew/librairi.cpp:190 #: pcbnew/files.cpp:57 #: eeschema/libedit.cpp:113 -#: eeschema/find.cpp:482 -#: gerbview/readgerb.cpp:141 +#: eeschema/find.cpp:249 +#: eeschema/find.cpp:257 +#: eeschema/find.cpp:698 #: gerbview/dcode.cpp:260 +#: gerbview/readgerb.cpp:141 #: common/eda_doc.cpp:144 msgid " not found" msgstr " non trouvé" @@ -372,364 +425,181 @@ msgstr "Ajout de stub (arc)" msgid "Add Polynomial Shape" msgstr "Ajout Forme polynomiale" -#: pcbnew/clean.cpp:163 -msgid "Delete unconnected tracks:" -msgstr "Suppression Pistes non connectées" +#: pcbnew/find.cpp:127 +msgid "Marker found" +msgstr "Marqueur trouvé" -#: pcbnew/clean.cpp:181 -msgid "ViaDef" -msgstr "ViaDef" - -#: pcbnew/clean.cpp:332 -msgid "Clean Null Segments" -msgstr "Nettoyage segments nulls" - -#: pcbnew/clean.cpp:420 -msgid "Merging Segments:" -msgstr "Associe Segment" - -#: pcbnew/clean.cpp:422 -msgid "Merge" -msgstr "Merge" - -#: pcbnew/clean.cpp:422 -#: pcbnew/dialog_pad_edit.cpp:186 -#: eeschema/dialog_erc.cpp:192 -#: eeschema/dialog_erc.cpp:196 -#: eeschema/dialog_edit_component_in_schematic.cpp:172 -msgid "0" -msgstr "0" - -#: pcbnew/clean.cpp:435 -msgid "Merge: " -msgstr "Merge: " - -#: pcbnew/clean.cpp:647 -msgid "DRC Control:" -msgstr "Controle DRC:" - -#: pcbnew/clean.cpp:652 -msgid "NetCtr" -msgstr "NetCtr" - -#: pcbnew/clean.cpp:886 -msgid "Centre" -msgstr "Centre" - -#: pcbnew/clean.cpp:886 -msgid "0 " -msgstr "0" - -#: pcbnew/clean.cpp:897 -msgid "Pads: " -msgstr "Pastilles: " - -#: pcbnew/clean.cpp:900 -msgid "Max" -msgstr "Max" - -#: pcbnew/clean.cpp:902 -msgid "Segm" -msgstr "Segm" - -#: pcbnew/classpcb.cpp:181 -#: pcbnew/class_track.cpp:689 -#: pcbnew/class_text_mod.cpp:337 -#: gerbview/affiche.cpp:93 -msgid "Type" -msgstr "Type" - -#: pcbnew/classpcb.cpp:183 -msgid "Shape" -msgstr "Forme" - -#: pcbnew/classpcb.cpp:186 -#: pcbnew/class_track.cpp:715 -#: pcbnew/dialog_pad_edit.cpp:176 -#: pcbnew/dialog_pad_edit.cpp:196 -#: pcbnew/class_board_item.cpp:100 -msgid "Circle" -msgstr "Cercle" - -#: pcbnew/classpcb.cpp:190 -msgid " Arc " -msgstr " Arc " - -#: pcbnew/classpcb.cpp:195 -#: pcbnew/class_track.cpp:713 -msgid "Segment" -msgstr "Segment" - -#: pcbnew/classpcb.cpp:197 -#: pcbnew/class_pcb_text.cpp:167 -#: pcbnew/class_track.cpp:745 -#: pcbnew/class_pad.cpp:907 -#: pcbnew/sel_layer.cpp:122 -#: pcbnew/dialog_edit_module.cpp:237 -#: pcbnew/class_text_mod.cpp:347 -#: pcbnew/class_text_mod.cpp:351 -#: pcbnew/class_module.cpp:1116 -#: gerbview/affiche.cpp:109 -msgid "Layer" -msgstr "Couche" - -#: pcbnew/classpcb.cpp:202 -#: pcbnew/class_pcb_text.cpp:181 -#: pcbnew/class_track.cpp:768 -#: pcbnew/dialog_edit_mod_text.cpp:204 -#: pcbnew/mirepcb.cpp:117 -#: pcbnew/cotation.cpp:135 -#: pcbnew/pcbtexte.cpp:133 -#: pcbnew/class_edge_mod.cpp:297 -#: pcbnew/class_text_mod.cpp:364 -#: eeschema/affiche.cpp:188 -#: eeschema/dialog_cmp_graphic_properties.cpp:188 -#: gerbview/affiche.cpp:52 -#: gerbview/affiche.cpp:113 -msgid "Width" -msgstr "Epaisseur" - -#: pcbnew/drc.cpp:78 -msgid "Look for active routes\n" -msgstr "Recherche des chevelus actifs\n" - -#: pcbnew/drc.cpp:90 -msgid "Unconnected found:\n" -msgstr "Non connecté trouvé:\n" - -#: pcbnew/drc.cpp:95 +#: pcbnew/find.cpp:129 #, c-format -msgid "%d > Pad %s (%s) @ %.4f,%.4f and " -msgstr "%d > Pad %s (%s) @ %.4f,%.4f et " +msgid "<%s> Found" +msgstr "<%s> trouvé" -#: pcbnew/drc.cpp:106 +#: pcbnew/find.cpp:156 +msgid "Marker not found" +msgstr "Marqueur non trouvé" + +#: pcbnew/find.cpp:158 #, c-format -msgid "Pad %s (%s) @ %.4f,%.4f\n" -msgstr "Pad %s (%s) @ %.4f,%.4f\n" +msgid "<%s> Not Found" +msgstr "<%s> Non trouvé" -#: pcbnew/drc.cpp:115 -#, c-format -msgid "Active routes: %d\n" -msgstr "Active routes: %d\n" +#: pcbnew/find.cpp:265 +#: eeschema/dialog_find.cpp:107 +msgid "Item to find:" +msgstr "Elément a chercher:" -#: pcbnew/drc.cpp:117 -msgid "OK! (No active routes)\n" -msgstr "OK! (Pas de chevelu actif)\n" +#: pcbnew/find.cpp:286 +msgid "Find Item" +msgstr "Chercher Item" -#: pcbnew/drc.cpp:168 -#, c-format -msgid "** End Drc: %d errors **\n" -msgstr "** FinDrc: %d erreurs **\n" +#: pcbnew/find.cpp:292 +msgid "Find Next Item" +msgstr "Chercher Item Suivant" -#: pcbnew/drc.cpp:170 -msgid "** End Drc: No Error **\n" -msgstr "** Fin Drc: Aucune Erreur **\n" +#: pcbnew/find.cpp:301 +msgid "Find Marker" +msgstr "Chercher Marqueur" -#: pcbnew/drc.cpp:178 -#, c-format -msgid "Report file <%s> created\n" -msgstr "Fichier rapport <%s> créé\n" +#: pcbnew/find.cpp:307 +msgid "Find Next Marker" +msgstr "Marqueur Suivant" -#: pcbnew/drc.cpp:264 -msgid "Tst Pad to Pad\n" -msgstr "Tst Pad to Pad\n" - -#: pcbnew/drc.cpp:309 -#: pcbnew/drc.cpp:382 -msgid "SegmNb" -msgstr "SegmNb" - -#: pcbnew/drc.cpp:310 -msgid "Track Err" -msgstr "Err Pistes" - -#: pcbnew/drc.cpp:314 -msgid "Tst Tracks\n" -msgstr "Tst Pistes\n" - -#: pcbnew/drc.cpp:344 -#: pcbnew/drc.cpp:417 -#: eeschema/eelayer.cpp:141 -msgid "Netname" -msgstr "NetName" - -#: pcbnew/drc.cpp:383 -msgid "Zone Err" -msgstr "Err. Zone" - -#: pcbnew/drc.cpp:386 -msgid "Tst Zones\n" -msgstr "Test Zones\n" - -#: pcbnew/drc.cpp:1323 -#, c-format -msgid "%d Drc Err %d %s (net %s)and PAD %s (%s) net %s @ %d,%d\n" -msgstr "%d Err Drc %d %s (net %s) et PAD %s (%s) net %s @ %d,%d\n" - -#: pcbnew/drc.cpp:1339 -#, c-format -msgid "%d Err type %d: %s (net %s) and VIA (net %s) @ %d,%d\n" -msgstr "%d Err type %d: %s (net %s) et VIA (net %s) @ %d,%d\n" - -#: pcbnew/drc.cpp:1354 -#, c-format -msgid "%d Err type %d: %s (net %s) and track (net %s) @ %d,%d\n" -msgstr "%d Err type %d: %s (net %s) et piste (net %s) @ %d,%d\n" - -#: pcbnew/drc.cpp:1408 -#, c-format -msgid "%d Drc Err: PAD %s (%s) net %s @ %d,%d and PAD %s (%s) net %s @ %d,%d\n" -msgstr "%d Err Drc: PAD %s (%s) net %s @ %d,%d et PAD %s (%s) net %s @ %d,%d\n" - -#: pcbnew/modules.cpp:81 -msgid "Footprint name:" -msgstr "Nom Module: " - -#: pcbnew/modules.cpp:281 -#: pcbnew/onrightclick.cpp:638 -msgid "Delete Module" -msgstr "Supprimer Module" - -#: pcbnew/modules.cpp:282 -msgid "Value " -msgstr "Valeur " - -#: pcbnew/gendrill.cpp:147 +#: pcbnew/gendrill.cpp:150 msgid "Drill tools" msgstr "Outils de perçage" -#: pcbnew/gendrill.cpp:168 +#: pcbnew/gendrill.cpp:171 #: pcbnew/dialog_general_options.cpp:271 #: eeschema/options.cpp:185 #: gerbview/options.cpp:184 msgid "millimeters" msgstr "millimetres" -#: pcbnew/gendrill.cpp:168 +#: pcbnew/gendrill.cpp:171 #: eeschema/options.cpp:185 #: eeschema/dialog_options.cpp:246 msgid "inches" msgstr "Pouces" -#: pcbnew/gendrill.cpp:170 +#: pcbnew/gendrill.cpp:173 msgid "Drill Units:" msgstr "Unités perçage:" -#: pcbnew/gendrill.cpp:177 +#: pcbnew/gendrill.cpp:181 msgid "decimal format" msgstr "Format décimal" -#: pcbnew/gendrill.cpp:178 +#: pcbnew/gendrill.cpp:182 msgid "suppress leading zeros" msgstr "Suppression zeros de tête" -#: pcbnew/gendrill.cpp:178 +#: pcbnew/gendrill.cpp:182 msgid "suppress trailing zeros" msgstr "Suppression zeros de fin" -#: pcbnew/gendrill.cpp:178 +#: pcbnew/gendrill.cpp:182 msgid "keep zeros" msgstr "Garder les zéros" -#: pcbnew/gendrill.cpp:181 +#: pcbnew/gendrill.cpp:185 msgid "Zeros Format" msgstr "Format des zéros" -#: pcbnew/gendrill.cpp:188 -#: pcbnew/gendrill.cpp:428 +#: pcbnew/gendrill.cpp:192 +#: pcbnew/gendrill.cpp:443 msgid "2:3" msgstr "2:3" -#: pcbnew/gendrill.cpp:188 -#: pcbnew/gendrill.cpp:429 +#: pcbnew/gendrill.cpp:192 +#: pcbnew/gendrill.cpp:444 msgid "2:4" msgstr "2:4" -#: pcbnew/gendrill.cpp:189 -#: pcbnew/gendrill.cpp:433 +#: pcbnew/gendrill.cpp:193 +#: pcbnew/gendrill.cpp:449 msgid "3:2" msgstr "3:2" -#: pcbnew/gendrill.cpp:189 -#: pcbnew/gendrill.cpp:434 +#: pcbnew/gendrill.cpp:193 +#: pcbnew/gendrill.cpp:450 msgid "3:3" msgstr "3:3" -#: pcbnew/gendrill.cpp:195 +#: pcbnew/gendrill.cpp:199 msgid "Precision" msgstr "Précision" -#: pcbnew/gendrill.cpp:206 +#: pcbnew/gendrill.cpp:211 msgid "absolute" msgstr "Absolu" -#: pcbnew/gendrill.cpp:206 +#: pcbnew/gendrill.cpp:211 msgid "auxiliary axis" msgstr "Axe Auxiliaire" -#: pcbnew/gendrill.cpp:208 +#: pcbnew/gendrill.cpp:213 msgid "Drill Origin:" msgstr "Origine des coord de percage:" -#: pcbnew/gendrill.cpp:216 -#: pcbnew/gendrill.cpp:224 +#: pcbnew/gendrill.cpp:222 +#: pcbnew/gendrill.cpp:230 #: eeschema/libedit.cpp:41 #: eeschema/viewlibs.cpp:119 msgid "None" msgstr "Aucun" -#: pcbnew/gendrill.cpp:216 +#: pcbnew/gendrill.cpp:222 msgid "drill sheet (HPGL)" msgstr "Plan de perçage (HPGL)" -#: pcbnew/gendrill.cpp:216 +#: pcbnew/gendrill.cpp:222 msgid "drill sheet (PostScript)" msgstr "Plan de perçage (Postscript)" -#: pcbnew/gendrill.cpp:218 +#: pcbnew/gendrill.cpp:224 msgid "Drill Sheet:" msgstr "Plan de perçage:" -#: pcbnew/gendrill.cpp:224 +#: pcbnew/gendrill.cpp:230 msgid "Drill report" msgstr "Rapport de perçage" -#: pcbnew/gendrill.cpp:226 +#: pcbnew/gendrill.cpp:232 msgid "Drill Report:" msgstr "Rapport de perçage:" -#: pcbnew/gendrill.cpp:231 +#: pcbnew/gendrill.cpp:238 msgid "Via Drill" msgstr "Perçage des vias" -#: pcbnew/gendrill.cpp:235 +#: pcbnew/gendrill.cpp:243 #: eeschema/plothpgl.cpp:239 msgid "Pen Number" msgstr "Numéro de plume" -#: pcbnew/gendrill.cpp:238 +#: pcbnew/gendrill.cpp:246 msgid "Speed (cm/s)" msgstr "Vitesse plume ( cm/s )" -#: pcbnew/gendrill.cpp:241 +#: pcbnew/gendrill.cpp:249 msgid "mirror y axis" msgstr "Miroir sur axe Y" -#: pcbnew/gendrill.cpp:245 +#: pcbnew/gendrill.cpp:253 msgid "minimal header" msgstr "Entête minimal" -#: pcbnew/gendrill.cpp:251 +#: pcbnew/gendrill.cpp:259 msgid "&Execute" msgstr "&Exécuter" -#: pcbnew/gendrill.cpp:255 +#: pcbnew/gendrill.cpp:263 #: pcbnew/dialog_netlist.cpp:178 #: pcbnew/dialog_drc.cpp:201 #: eeschema/plotps.cpp:208 -#: eeschema/dialog_edit_label.cpp:181 #: eeschema/netlist_control.cpp:124 -#: eeschema/netlist_control.cpp:275 +#: eeschema/netlist_control.cpp:274 +#: eeschema/dialog_edit_label.cpp:181 #: eeschema/dialog_edit_component_in_schematic.cpp:235 #: eeschema/annotate_dialog.cpp:154 #: common/svg_print.cpp:220 @@ -738,51 +608,51 @@ msgstr "&Ex msgid "&Close" msgstr "&Fermer" -#: pcbnew/gendrill.cpp:369 +#: pcbnew/gendrill.cpp:380 msgid "Drill file" msgstr "Fichier de percage" -#: pcbnew/gendrill.cpp:383 -#: pcbnew/gendrill.cpp:1459 +#: pcbnew/gendrill.cpp:394 +#: pcbnew/gendrill.cpp:1611 #: pcbnew/plotps.cpp:51 #: pcbnew/xchgmod.cpp:642 msgid "Unable to create file " msgstr "Impossible de créer le fichier " -#: pcbnew/gendrill.cpp:390 -#: pcbnew/gendrill.cpp:938 -#: pcbnew/gendrill.cpp:1465 +#: pcbnew/gendrill.cpp:401 +#: pcbnew/gendrill.cpp:1027 +#: pcbnew/gendrill.cpp:1617 #: pcbnew/plotps.cpp:58 #: pcbnew/plothpgl.cpp:74 #: pcbnew/plotgerb.cpp:83 msgid "File" msgstr "Fichier" -#: pcbnew/gendrill.cpp:396 -#: pcbnew/gendrill.cpp:943 -#: pcbnew/gendrill.cpp:1470 +#: pcbnew/gendrill.cpp:407 +#: pcbnew/gendrill.cpp:1032 +#: pcbnew/gendrill.cpp:1622 msgid "Tools" msgstr "Outils" -#: pcbnew/gendrill.cpp:400 -#: pcbnew/gendrill.cpp:1009 -#: pcbnew/gendrill.cpp:1522 -#: pcbnew/class_track.cpp:760 -#: pcbnew/class_track.cpp:765 +#: pcbnew/gendrill.cpp:411 +#: pcbnew/gendrill.cpp:1098 +#: pcbnew/gendrill.cpp:1674 #: pcbnew/class_pad.cpp:930 +#: pcbnew/class_track.cpp:771 +#: pcbnew/class_track.cpp:776 msgid "Drill" msgstr "Perçage" -#: pcbnew/gendrill.cpp:874 +#: pcbnew/gendrill.cpp:962 msgid "Drill Map file" msgstr "Fichier Plan de perçage" -#: pcbnew/gendrill.cpp:932 +#: pcbnew/gendrill.cpp:1021 #, c-format msgid "Unable to create file <%s>" msgstr "Impossible de créer fichier <%s>" -#: pcbnew/gendrill.cpp:1217 +#: pcbnew/gendrill.cpp:1320 msgid "" " Drill map: Too many diameter values to draw to draw one symbol per drill value (max 13)\n" "Plot uses circle shape for some drill values" @@ -790,7 +660,7 @@ msgstr "" "Plan de reçage: trop de diametres différents pour tracer 1 symbole par diametre\n" "Le tracé utilise des cercles pour quelques valeurs " -#: pcbnew/gendrill.cpp:1445 +#: pcbnew/gendrill.cpp:1596 msgid "Drill Report file" msgstr "Fichier rapport de perçage:" @@ -830,18 +700,97 @@ msgstr "Valeur incorrecte pour diametre de per msgid "Incorrect value for pad offset" msgstr "Valeur incorrecte pour offset du pad" -#: pcbnew/hotkeys.cpp:435 -#, c-format -msgid "Footprint %s found, but locked" -msgstr "Module %s trouvé, mais verrouillé" +#: pcbnew/pcbpiste.cpp:62 +#: pcbnew/swap_layers.cpp:60 +msgid "Swap Layers:" +msgstr "Permutte couches" -#: pcbnew/hotkeys.cpp:598 -msgid "Delete module?" -msgstr "Effacer Module?" +#: pcbnew/pcbpiste.cpp:77 +#: pcbnew/pcbpiste.cpp:135 +#: pcbnew/swap_layers.cpp:76 +#: pcbnew/swap_layers.cpp:134 +msgid "No Change" +msgstr "Garder" + +#: pcbnew/pcbpiste.cpp:81 +#: pcbnew/swap_layers.cpp:80 +#: gerbview/select_layers_to_pcb.cpp:120 +msgid "Layers" +msgstr "Couches" + +#: pcbnew/pcbpiste.cpp:89 +#: pcbnew/cotation.cpp:115 +#: pcbnew/block.cpp:153 +#: pcbnew/pcbtexte.cpp:119 +#: pcbnew/mirepcb.cpp:107 +#: pcbnew/muonde.cpp:355 +#: pcbnew/dialog_edit_module.cpp:124 +#: pcbnew/modedit_onclick.cpp:202 +#: pcbnew/modedit_onclick.cpp:234 +#: pcbnew/sel_layer.cpp:137 +#: pcbnew/sel_layer.cpp:268 +#: pcbnew/globaleditpad.cpp:111 +#: pcbnew/swap_layers.cpp:88 +#: pcbnew/onrightclick.cpp:142 +#: pcbnew/onrightclick.cpp:156 +#: eeschema/sheetlab.cpp:105 +#: eeschema/options.cpp:114 +#: eeschema/libedpart.cpp:223 +#: eeschema/libedit_onrightclick.cpp:68 +#: eeschema/libedit_onrightclick.cpp:83 +#: eeschema/onrightclick.cpp:121 +#: eeschema/onrightclick.cpp:133 +#: gerbview/select_layers_to_pcb.cpp:127 +#: gerbview/options.cpp:167 +#: gerbview/options.cpp:296 +#: gerbview/reglage.cpp:120 +#: gerbview/onrightclick.cpp:40 +#: gerbview/onrightclick.cpp:59 +#: common/selcolor.cpp:147 +#: common/displlst.cpp:105 +#: common/get_component_dialog.cpp:121 +msgid "Cancel" +msgstr "Annuler" + +#: pcbnew/pcbpiste.cpp:96 +#: pcbnew/sel_layer.cpp:132 +#: pcbnew/sel_layer.cpp:264 +#: pcbnew/swap_layers.cpp:95 +#: eeschema/options.cpp:110 +#: gerbview/select_layers_to_pcb.cpp:131 +#: gerbview/options.cpp:163 +#: gerbview/options.cpp:292 +#: gerbview/reglage.cpp:116 +#: common/get_component_dialog.cpp:112 +msgid "OK" +msgstr "OK" + +#: pcbnew/pcbpiste.cpp:103 +#: pcbnew/swap_layers.cpp:102 +#: gerbview/select_layers_to_pcb.cpp:135 +msgid "Deselect" +msgstr "Deselection" + +#: pcbnew/pcbpiste.cpp:110 +#: pcbnew/dialog_netlist.cpp:162 +#: pcbnew/swap_layers.cpp:109 +#: gerbview/select_layers_to_pcb.cpp:139 +msgid "Select" +msgstr "Sélection" + +#: pcbnew/pcbpiste.cpp:259 +#: pcbnew/surbrill.cpp:35 +msgid "Filter for net names:" +msgstr "Filtre pour nets:" + +#: pcbnew/pcbpiste.cpp:263 +#: pcbnew/surbrill.cpp:39 +msgid "List Nets" +msgstr "Liste équipots" #: pcbnew/plotps.cpp:361 #: pcbnew/affiche.cpp:63 -#: pcbnew/class_board.cpp:288 +#: pcbnew/class_board.cpp:314 msgid "Vias" msgstr "Vias" @@ -1059,7 +1008,7 @@ msgid "Add Tracks an vias" msgstr "Ajouter pistes et vias" #: pcbnew/tool_pcb.cpp:429 -#: pcbnew/edit.cpp:575 +#: pcbnew/edit.cpp:325 msgid "Add Zones" msgstr "Addition de Zones" @@ -1080,7 +1029,7 @@ msgid "Add graphic arc" msgstr "Addition de graphiques (Arc de Cercle)" #: pcbnew/tool_pcb.cpp:446 -#: pcbnew/edit.cpp:598 +#: pcbnew/edit.cpp:348 #: pcbnew/tool_modedit.cpp:180 #: eeschema/schedit.cpp:314 #: eeschema/libframe.cpp:502 @@ -1089,7 +1038,7 @@ msgid "Add Text" msgstr "Ajout de Texte" #: pcbnew/tool_pcb.cpp:451 -#: pcbnew/edit.cpp:606 +#: pcbnew/edit.cpp:356 msgid "Add Cotation" msgstr "Addition de Cotations" @@ -1156,209 +1105,106 @@ msgstr "Grille perso" msgid "+/- to switch" msgstr "+/- pour commuter" -#: pcbnew/initpcb.cpp:126 -msgid "Current Board will be lost ?" -msgstr "Le C.I. courant sera perdu ?" +#: pcbnew/cotation.cpp:89 +msgid "Cotation properties" +msgstr "Propriétés des Cotations" -#: pcbnew/initpcb.cpp:212 -msgid "Delete Zones ?" -msgstr "Effacer Zones ?" - -#: pcbnew/initpcb.cpp:239 -msgid "Delete Board edges ?" -msgstr "Effacement contour PCB" - -#: pcbnew/initpcb.cpp:244 -msgid "Delete draw items?" -msgstr "Suppression éléments graphiques?" - -#: pcbnew/initpcb.cpp:286 -#: gerbview/initpcb.cpp:152 -msgid "Delete Tracks?" -msgstr "Effacer Pistes ?" - -#: pcbnew/initpcb.cpp:307 -msgid "Delete Modules?" -msgstr "Effacement des Modules?" - -#: pcbnew/initpcb.cpp:330 -#: gerbview/initpcb.cpp:175 -msgid "Delete Pcb Texts" -msgstr "Effacer Textes Pcb" - -#: pcbnew/block.cpp:119 -#: pcbnew/muonde.cpp:351 -#: pcbnew/zones.cpp:984 -#: pcbnew/mirepcb.cpp:103 #: pcbnew/cotation.cpp:110 +#: pcbnew/zones.cpp:984 +#: pcbnew/block.cpp:156 #: pcbnew/pcbtexte.cpp:114 +#: pcbnew/mirepcb.cpp:103 +#: pcbnew/muonde.cpp:351 #: pcbnew/dialog_edit_module.cpp:119 #: eeschema/sheetlab.cpp:100 #: eeschema/editpart.cpp:197 #: eeschema/libedpart.cpp:235 -#: common/displlst.cpp:102 +#: common/displlst.cpp:101 msgid "Ok" msgstr "Ok" -#: pcbnew/block.cpp:124 -#: pcbnew/pcbpiste.cpp:87 -#: pcbnew/muonde.cpp:355 -#: pcbnew/mirepcb.cpp:107 -#: pcbnew/cotation.cpp:115 -#: pcbnew/pcbtexte.cpp:119 -#: pcbnew/modedit_onclick.cpp:202 -#: pcbnew/modedit_onclick.cpp:234 -#: pcbnew/sel_layer.cpp:137 -#: pcbnew/sel_layer.cpp:268 -#: pcbnew/globaleditpad.cpp:111 -#: pcbnew/dialog_edit_module.cpp:124 -#: pcbnew/swap_layers.cpp:88 -#: pcbnew/onrightclick.cpp:133 -#: pcbnew/onrightclick.cpp:151 -#: eeschema/sheetlab.cpp:105 -#: eeschema/options.cpp:114 -#: eeschema/optionsframe.cpp:155 -#: eeschema/libedpart.cpp:223 -#: eeschema/libedit_onrightclick.cpp:68 -#: eeschema/libedit_onrightclick.cpp:83 -#: eeschema/onrightclick.cpp:114 -#: eeschema/onrightclick.cpp:129 -#: gerbview/select_layers_to_pcb.cpp:127 -#: gerbview/options.cpp:167 -#: gerbview/options.cpp:296 -#: gerbview/reglage.cpp:120 -#: gerbview/onrightclick.cpp:40 -#: gerbview/onrightclick.cpp:59 -#: common/displlst.cpp:106 -#: common/selcolor.cpp:147 -#: common/get_component_dialog.cpp:121 -msgid "Cancel" -msgstr "Annuler" +#: pcbnew/cotation.cpp:119 +#: pcbnew/pcbtexte.cpp:179 +#: pcbnew/muonde.cpp:363 +#: pcbnew/dialog_edit_module.cpp:245 +#: pcbnew/dialog_edit_module.cpp:291 +#: eeschema/options.cpp:177 +#: eeschema/dialog_options.cpp:229 +#: eeschema/editpart.cpp:324 +#: eeschema/dialog_edit_component_in_schematic.cpp:182 +#: eeschema/onrightclick.cpp:304 +msgid "Normal" +msgstr "Normal" -#: pcbnew/block.cpp:130 -msgid "Include Modules" -msgstr "Inclure Modules" +#: pcbnew/cotation.cpp:119 +#: pcbnew/class_pcb_text.cpp:171 +#: pcbnew/pcbtexte.cpp:179 +#: pcbnew/modedit_onclick.cpp:253 +#: pcbnew/class_text_mod.cpp:358 +#: gerbview/affiche.cpp:40 +#: share/dialog_print.cpp:178 +msgid "Mirror" +msgstr "Miroir" -#: pcbnew/block.cpp:134 -msgid "Include tracks" -msgstr "Inclure Pistes" +#: pcbnew/cotation.cpp:120 +#: pcbnew/dialog_edit_mod_text.cpp:232 +#: pcbnew/pcbtexte.cpp:180 +#: pcbnew/class_text_mod.cpp:339 +#: pcbnew/dialog_general_options.cpp:264 +#: eeschema/affiche.cpp:92 +#: gerbview/options.cpp:174 +#: gerbview/tool_gerber.cpp:114 +msgid "Display" +msgstr "Affichage" -#: pcbnew/block.cpp:138 -#: pcbnew/dialog_drc.cpp:165 -msgid "Include zones" -msgstr "Inclure zones" +#: pcbnew/cotation.cpp:131 +#: pcbnew/pcbtexte.cpp:129 +#: pcbnew/mirepcb.cpp:112 +#: pcbnew/muonde.cpp:370 +#: eeschema/sheet.cpp:189 +#: eeschema/sheet.cpp:200 +#: eeschema/pinedit-dialog.cpp:273 +#: eeschema/pinedit-dialog.cpp:279 +#: common/wxwineda.cpp:91 +msgid "Size" +msgstr "Taille " -#: pcbnew/block.cpp:143 -msgid "Include Text on copper layers" -msgstr "Inclure Texte sur couches cuivre" +#: pcbnew/cotation.cpp:135 +#: pcbnew/class_pcb_text.cpp:181 +#: pcbnew/dialog_edit_mod_text.cpp:204 +#: pcbnew/pcbtexte.cpp:133 +#: pcbnew/mirepcb.cpp:117 +#: pcbnew/classpcb.cpp:202 +#: pcbnew/class_track.cpp:779 +#: pcbnew/class_edge_mod.cpp:297 +#: pcbnew/class_text_mod.cpp:364 +#: eeschema/affiche.cpp:188 +#: eeschema/dialog_cmp_graphic_properties.cpp:188 +#: gerbview/affiche.cpp:52 +#: gerbview/affiche.cpp:113 +msgid "Width" +msgstr "Epaisseur" -#: pcbnew/block.cpp:147 -msgid "Include drawings" -msgstr "Inclure tracés" +#: pcbnew/cotation.cpp:139 +#: gerbview/affiche.cpp:37 +msgid "Layer:" +msgstr "Couche:" -#: pcbnew/block.cpp:151 -msgid "Include egde layer" -msgstr "Inclure couche Edge" +#: pcbnew/router.cpp:60 +msgid "Unable to create temporary file " +msgstr "Impossible de créer le fichier temporaire " -#: pcbnew/block.cpp:437 -msgid "Delete Block" -msgstr "Effacer Bloc" +#: pcbnew/router.cpp:65 +msgid "Create temporary file " +msgstr "Creation fichier temporaire " -#: pcbnew/block.cpp:448 -msgid "Delete Footprints" -msgstr "Suppression modules" +#: pcbnew/router.cpp:566 +msgid "Unable to find data file " +msgstr "Impossible de trouver le fichier de données " -#: pcbnew/block.cpp:468 -msgid "Delete tracks" -msgstr "Suppression Pistes" - -#: pcbnew/block.cpp:488 -msgid "Delete draw layers" -msgstr "Suppression couches sessin" - -#: pcbnew/block.cpp:553 -msgid "Delete zones" -msgstr "SuppressionZones" - -#: pcbnew/block.cpp:587 -msgid "Rotate Block" -msgstr "Rotation Bloc" - -#: pcbnew/block.cpp:602 -msgid "Footprint rotation" -msgstr "Rotation modules" - -#: pcbnew/block.cpp:636 -msgid "Track rotation" -msgstr "Rotation pistes" - -#: pcbnew/block.cpp:657 -msgid "Zone rotation" -msgstr "Rotation Zones" - -#: pcbnew/block.cpp:678 -msgid "Draw layers rotation" -msgstr "Rotation couches dessin" - -#: pcbnew/block.cpp:797 -msgid "Block mirroring" -msgstr "Bloc Miroir" - -#: pcbnew/block.cpp:812 -msgid "Footprint mirroring" -msgstr "Miroir modules" - -#: pcbnew/block.cpp:845 -msgid "Track mirroring" -msgstr "Miroir Pistes" - -#: pcbnew/block.cpp:871 -msgid "Zone mirroring" -msgstr "Miroir zone" - -#: pcbnew/block.cpp:893 -msgid "Draw layers mirroring" -msgstr "Draw layers mirroring" - -#: pcbnew/block.cpp:1020 -msgid "Move Block" -msgstr "Déplacer Bloc" - -#: pcbnew/block.cpp:1032 -msgid "Move footprints" -msgstr "Déplacement modules" - -#: pcbnew/block.cpp:1065 -msgid "Move tracks" -msgstr "Déplacement pistes" - -#: pcbnew/block.cpp:1086 -msgid "Move zones" -msgstr "Déplacement zones" - -#: pcbnew/block.cpp:1107 -msgid "Move draw layers" -msgstr "Déplacement couches dessin" - -#: pcbnew/block.cpp:1212 -msgid "Copy Block" -msgstr "Copie Bloc" - -#: pcbnew/block.cpp:1224 -msgid "Module copy" -msgstr "Copie Modules" - -#: pcbnew/block.cpp:1263 -msgid "Track copy" -msgstr "Copie Piste" - -#: pcbnew/block.cpp:1287 -msgid "Zone copy" -msgstr "Copie Zone" - -#: pcbnew/block.cpp:1312 -msgid "Draw layers copy" -msgstr "Cpoie des couches dessin" +#: pcbnew/router.cpp:572 +msgid "Reading autorouter data file " +msgstr "Lecture fichier données de l'autorouteur" #: pcbnew/class_pcb_text.cpp:163 #: gerbview/affiche.cpp:29 @@ -1370,15 +1216,18 @@ msgstr "COTATION" msgid "PCB Text" msgstr "Texte Pcb" -#: pcbnew/class_pcb_text.cpp:171 -#: pcbnew/cotation.cpp:119 -#: pcbnew/pcbtexte.cpp:179 -#: pcbnew/modedit_onclick.cpp:253 -#: pcbnew/class_text_mod.cpp:358 -#: gerbview/affiche.cpp:40 -#: share/dialog_print.cpp:178 -msgid "Mirror" -msgstr "Miroir" +#: pcbnew/class_pcb_text.cpp:167 +#: pcbnew/class_pad.cpp:907 +#: pcbnew/classpcb.cpp:197 +#: pcbnew/dialog_edit_module.cpp:237 +#: pcbnew/sel_layer.cpp:122 +#: pcbnew/class_track.cpp:755 +#: pcbnew/class_text_mod.cpp:347 +#: pcbnew/class_text_mod.cpp:351 +#: pcbnew/class_module.cpp:1116 +#: gerbview/affiche.cpp:109 +msgid "Layer" +msgstr "Couche" #: pcbnew/class_pcb_text.cpp:173 #: pcbnew/dialog_display_options.cpp:273 @@ -1422,39 +1271,31 @@ msgstr "Taille H" msgid "V Size" msgstr "Taille V" -#: pcbnew/class_track.cpp:678 -#: pcbnew/pcbframe.cpp:442 -#: pcbnew/class_board_item.cpp:127 -msgid "Track" -msgstr "Piste" +#: pcbnew/edgemod.cpp:204 +msgid "The graphic item will be on a copper layer.It is very dangerous. Are you sure" +msgstr "L'élément graphique sera sur une couche cuivre. C'est très dangereux. Etes vous sûr" -#: pcbnew/class_track.cpp:682 -#: pcbnew/class_board_item.cpp:137 -msgid "Zone" -msgstr "Zone" +#: pcbnew/edgemod.cpp:246 +msgid "New Width (1/10000\"):" +msgstr "Novelle largeur (1/10000\"):" -#: pcbnew/class_track.cpp:704 -#: pcbnew/zones.cpp:916 -msgid "NetName" -msgstr "NetName" +#: pcbnew/edgemod.cpp:253 +msgid "Incorrect number, no change" +msgstr "Nombre incorrect, pas de changement" -#: pcbnew/class_track.cpp:709 -msgid "NetCode" -msgstr "NetCode" +#: pcbnew/modules.cpp:81 +msgid "Footprint name:" +msgstr "Nom Module: " -#: pcbnew/class_track.cpp:717 -#: pcbnew/dialog_pad_edit.cpp:205 -msgid "Standard" -msgstr "Standard" +#: pcbnew/modules.cpp:281 +#: pcbnew/onrightclick.cpp:637 +msgid "Delete Module" +msgstr "Supprimer Module" -#: pcbnew/class_track.cpp:729 -#: pcbnew/class_module.cpp:1135 -msgid "Stat" -msgstr "Stat" - -#: pcbnew/class_track.cpp:753 -msgid "Diam" -msgstr "Diam" +#: pcbnew/modules.cpp:282 +#: eeschema/find.cpp:228 +msgid "Value " +msgstr "Valeur " #: pcbnew/dialog_edit_mod_text.cpp:156 #, c-format @@ -1504,10 +1345,10 @@ msgid "&OK" msgstr "&OK" #: pcbnew/dialog_edit_mod_text.cpp:217 +#: pcbnew/zones.cpp:216 #: pcbnew/dialog_initpcb.cpp:164 #: pcbnew/dialog_track_options.cpp:185 #: pcbnew/dialog_display_options.cpp:284 -#: pcbnew/zones.cpp:216 #: pcbnew/set_grid.cpp:176 #: pcbnew/dialog_pad_edit.cpp:221 #: pcbnew/dialog_graphic_items_options.cpp:265 @@ -1545,17 +1386,6 @@ msgstr "Visible" msgid "no show" msgstr "Invisible" -#: pcbnew/dialog_edit_mod_text.cpp:232 -#: pcbnew/cotation.cpp:120 -#: pcbnew/pcbtexte.cpp:180 -#: pcbnew/class_text_mod.cpp:339 -#: pcbnew/dialog_general_options.cpp:264 -#: eeschema/affiche.cpp:92 -#: gerbview/options.cpp:174 -#: gerbview/tool_gerber.cpp:114 -msgid "Display" -msgstr "Affichage" - #: pcbnew/dialog_edit_mod_text.cpp:313 #: eeschema/edit_component_in_lib.cpp:518 #: eeschema/edit_component_in_schematic.cpp:211 @@ -1569,17 +1399,87 @@ msgstr "Valeur:" msgid "Text:" msgstr "Texte:" -#: pcbnew/edgemod.cpp:204 -msgid "The graphic item will be on a copper layer.It is very dangerous. Are you sure" -msgstr "L'élément graphique sera sur une couche cuivre. C'est très dangereux. Etes vous sûr" +#: pcbnew/zones.cpp:152 +#: pcbnew/zones.cpp:153 +#: pcbnew/zones.cpp:154 +#: pcbnew/zones.cpp:155 +msgid "0.00000" +msgstr "0.00000" -#: pcbnew/edgemod.cpp:246 -msgid "New Width (1/10000\"):" -msgstr "Novelle largeur (1/10000\"):" +#: pcbnew/zones.cpp:159 +msgid "Grid size:" +msgstr "Dim Grille" -#: pcbnew/edgemod.cpp:253 -msgid "Incorrect number, no change" -msgstr "Nombre incorrect, pas de changement" +#: pcbnew/zones.cpp:164 +msgid "Zone clearance value (mm):" +msgstr "Valeur isolation zone (mm):" + +#: pcbnew/zones.cpp:181 +msgid "Include Pads" +msgstr "Inclure Pads" + +#: pcbnew/zones.cpp:182 +msgid "Thermal" +msgstr "Thermique" + +#: pcbnew/zones.cpp:183 +msgid "Exclude Pads" +msgstr "Exclure Pads" + +#: pcbnew/zones.cpp:187 +msgid "Pad options:" +msgstr "Options pads" + +#: pcbnew/zones.cpp:192 +#: eeschema/options.cpp:194 +#: eeschema/dialog_options.cpp:257 +msgid "Any" +msgstr "Tout" + +#: pcbnew/zones.cpp:193 +msgid "H , V and 45 deg" +msgstr "H, V et 45 deg" + +#: pcbnew/zones.cpp:197 +msgid "Zone edges orient:" +msgstr "Direction contours zone:" + +#: pcbnew/zones.cpp:209 +msgid "Fill" +msgstr "Remplissage" + +#: pcbnew/zones.cpp:223 +msgid "Update Options" +msgstr "Maj Options" + +#: pcbnew/zones.cpp:232 +msgid "Zone clearance value:" +msgstr "Valeur isolation zone:" + +#: pcbnew/zones.cpp:235 +msgid "Grid :" +msgstr "Grille:" + +#: pcbnew/zones.cpp:400 +msgid "New zone segment width: " +msgstr "Nouvelle largeur des segments zone:" + +#: pcbnew/zones.cpp:601 +msgid "Zone: No net selected" +msgstr "Zone: Net non sélectionné" + +#: pcbnew/zones.cpp:646 +msgid "Delete Current Zone Edges" +msgstr "Effacer contour zone courant" + +#: pcbnew/zones.cpp:914 +msgid "No Net" +msgstr "No Net" + +#: pcbnew/zones.cpp:916 +#: pcbnew/class_track.cpp:714 +msgid "NetName" +msgstr "NetName" #: pcbnew/netlist.cpp:96 #, c-format @@ -1654,18 +1554,15 @@ msgstr "Composant [%s]: Module <%sw non trouv #: pcbnew/reglage.cpp:101 #: pcbnew/dialog_setup_libs.cpp:97 #: eeschema/eestatus.cpp:111 -#: eeschema/dialog_set_status.cpp:75 #: eeschema/dialog_eeschema_config.cpp:105 #: cvpcb/dialog_cvpcb_config.cpp:74 #: gerbview/reglage.cpp:98 -#: eeschema/dialog_set_status.h:42 msgid "from " msgstr "De " #: pcbnew/reglage.cpp:108 #: pcbnew/dialog_setup_libs.cpp:153 #: eeschema/eestatus.cpp:116 -#: eeschema/dialog_set_status.cpp:130 #: eeschema/dialog_eeschema_config.cpp:161 #: cvpcb/dialog_display_options.cpp:145 #: cvpcb/dialog_cvpcb_config.cpp:127 @@ -1675,7 +1572,6 @@ msgstr "Sauver config" #: pcbnew/reglage.cpp:112 #: pcbnew/dialog_setup_libs.cpp:175 #: eeschema/eestatus.cpp:120 -#: eeschema/dialog_set_status.cpp:170 #: eeschema/dialog_eeschema_config.cpp:196 msgid "Del" msgstr "Supprimer" @@ -1683,7 +1579,6 @@ msgstr "Supprimer" #: pcbnew/reglage.cpp:116 #: pcbnew/dialog_setup_libs.cpp:179 #: eeschema/eestatus.cpp:124 -#: eeschema/dialog_set_status.cpp:174 #: eeschema/dialog_eeschema_config.cpp:200 #: eeschema/libedpart.cpp:284 #: eeschema/edit_component_in_lib.cpp:233 @@ -1694,7 +1589,6 @@ msgstr "Ajouter" #: pcbnew/reglage.cpp:120 #: pcbnew/dialog_setup_libs.cpp:183 #: eeschema/eestatus.cpp:128 -#: eeschema/dialog_set_status.cpp:178 #: eeschema/dialog_eeschema_config.cpp:204 msgid "Ins" msgstr "Insérer" @@ -1706,7 +1600,6 @@ msgstr "Lib Modules:" #: pcbnew/reglage.cpp:148 #: pcbnew/dialog_setup_libs.cpp:159 #: eeschema/eestatus.cpp:148 -#: eeschema/dialog_set_status.cpp:144 #: eeschema/dialog_eeschema_config.cpp:180 #: cvpcb/dialog_cvpcb_config.cpp:147 msgid "Files ext:" @@ -1753,17 +1646,12 @@ msgstr "Fichiers Librairies" msgid "Library exists! No Change" msgstr "Librairie existante! Pas de changement" -#: pcbnew/move-drag_pads.cpp:251 -#, c-format -msgid "Delete Pad (module %s %s) " -msgstr "Effacer Pad (module %s %s) " - #: pcbnew/dialog_netlist.cpp:133 #: pcbnew/class_board_item.cpp:67 #: eeschema/editpart.cpp:742 #: eeschema/eelayer.cpp:99 #: eeschema/dialog_create_component.cpp:164 -#: eeschema/onrightclick.cpp:314 +#: eeschema/onrightclick.cpp:316 #: eeschema/edit_component_in_schematic.cpp:745 msgid "Reference" msgstr "Référence" @@ -1782,9 +1670,9 @@ msgid "Keep" msgstr "Garder" #: pcbnew/dialog_netlist.cpp:141 -#: pcbnew/onrightclick.cpp:563 -#: pcbnew/onrightclick.cpp:670 -#: pcbnew/onrightclick.cpp:767 +#: pcbnew/onrightclick.cpp:562 +#: pcbnew/onrightclick.cpp:669 +#: pcbnew/onrightclick.cpp:766 #: eeschema/libedpart.cpp:290 #: eeschema/edit_component_in_lib.cpp:239 #: eeschema/edit_component_in_lib.cpp:320 @@ -1809,13 +1697,6 @@ msgstr "Echange module:" msgid "Display Warnings" msgstr "Affiche warnings" -#: pcbnew/dialog_netlist.cpp:162 -#: pcbnew/pcbpiste.cpp:105 -#: pcbnew/swap_layers.cpp:109 -#: gerbview/select_layers_to_pcb.cpp:139 -msgid "Select" -msgstr "Sélection" - #: pcbnew/dialog_netlist.cpp:166 msgid "Read" msgstr "Lire" @@ -1913,67 +1794,58 @@ msgstr "Afficher pistes en mode plein" msgid "Normal Contrast Mode Display" msgstr "Mode d'affichage Contraste normal" +#: pcbnew/pcbframe.cpp:442 +#: pcbnew/class_board_item.cpp:127 +#: pcbnew/class_track.cpp:688 +msgid "Track" +msgstr "Piste" + #: pcbnew/pcbframe.cpp:474 -#: pcbnew/class_board_item.cpp:141 +#: pcbnew/class_board_item.cpp:154 msgid "Via" msgstr "Via" -#: pcbnew/pcbpiste.cpp:62 -#: pcbnew/swap_layers.cpp:60 -msgid "Swap Layers:" -msgstr "Permutte couches" +#: pcbnew/class_pad.cpp:732 +msgid "Unknown Pad shape" +msgstr "Forme pad inconnue" -#: pcbnew/pcbpiste.cpp:77 -#: pcbnew/pcbpiste.cpp:130 -#: pcbnew/swap_layers.cpp:76 -#: pcbnew/swap_layers.cpp:134 -msgid "No Change" -msgstr "Garder" +#: pcbnew/class_pad.cpp:818 +#: pcbnew/class_edge_mod.cpp:285 +#: pcbnew/class_text_mod.cpp:328 +#: pcbnew/class_module.cpp:1142 +#: cvpcb/setvisu.cpp:30 +msgid "Module" +msgstr "Module" -#: pcbnew/pcbpiste.cpp:80 -#: pcbnew/swap_layers.cpp:80 -#: gerbview/select_layers_to_pcb.cpp:120 -msgid "Layers" -msgstr "Couches" +#: pcbnew/class_pad.cpp:821 +msgid "RefP" +msgstr "RefP" -#: pcbnew/pcbpiste.cpp:93 -#: pcbnew/sel_layer.cpp:132 -#: pcbnew/sel_layer.cpp:264 -#: pcbnew/swap_layers.cpp:95 -#: eeschema/options.cpp:110 -#: eeschema/optionsframe.cpp:151 -#: gerbview/select_layers_to_pcb.cpp:131 -#: gerbview/options.cpp:163 -#: gerbview/options.cpp:292 -#: gerbview/reglage.cpp:116 -#: common/get_component_dialog.cpp:112 -msgid "OK" -msgstr "OK" +#: pcbnew/class_pad.cpp:824 +#: pcbnew/class_board_item.cpp:35 +msgid "Net" +msgstr "Net" -#: pcbnew/pcbpiste.cpp:99 -#: pcbnew/swap_layers.cpp:102 -#: gerbview/select_layers_to_pcb.cpp:135 -msgid "Deselect" -msgstr "Deselection" +#: pcbnew/class_pad.cpp:938 +msgid "Drill X / Y" +msgstr "Perçage X/Y" -#: pcbnew/pcbpiste.cpp:241 -#: pcbnew/surbrill.cpp:35 -msgid "Filter for net names:" -msgstr "Filtre pour nets:" +#: pcbnew/class_pad.cpp:953 +msgid "X Pos" +msgstr "X Pos" -#: pcbnew/pcbpiste.cpp:244 -#: pcbnew/surbrill.cpp:39 -msgid "List Nets" -msgstr "Liste équipots" +#: pcbnew/class_pad.cpp:957 +msgid "Y pos" +msgstr "Y pos" -#: pcbnew/editrack-part2.cpp:32 +#: pcbnew/hotkeys.cpp:435 #, c-format -msgid "Track Width: %s Vias Size : %s" -msgstr "Larg. piste: %s Diam Vias : %s" +msgid "Footprint %s found, but locked" +msgstr "Module %s trouvé, mais verrouillé" -#: pcbnew/editrack-part2.cpp:135 -msgid "Drc error, cancelled" -msgstr "Erreur DRC, annulation" +#: pcbnew/hotkeys.cpp:598 +msgid "Delete module?" +msgstr "Effacer Module?" #: pcbnew/dialog_initpcb.cpp:105 msgid "Items to delete" @@ -2141,8 +2013,8 @@ msgstr "Modules" #: pcbnew/dialog_display_options.cpp:223 #: pcbnew/dialog_display_options.cpp:231 #: pcbnew/dialog_display_options.cpp:264 -#: pcbnew/pcbplot.cpp:330 #: pcbnew/class_board_item.cpp:91 +#: pcbnew/pcbplot.cpp:330 #: gerbview/options.cpp:316 msgid "Line" msgstr "Ligne" @@ -2182,21 +2054,130 @@ msgstr "Afficher autres msgid "Show page limits" msgstr " Afficher limites de page" -#: pcbnew/router.cpp:60 -msgid "Unable to create temporary file " -msgstr "Impossible de créer le fichier temporaire " +#: pcbnew/block.cpp:121 +msgid "Include Modules" +msgstr "Inclure Modules" -#: pcbnew/router.cpp:65 -msgid "Create temporary file " -msgstr "Creation fichier temporaire " +#: pcbnew/block.cpp:125 +msgid "Include tracks" +msgstr "Inclure Pistes" -#: pcbnew/router.cpp:566 -msgid "Unable to find data file " -msgstr "Impossible de trouver le fichier de données " +#: pcbnew/block.cpp:129 +#: pcbnew/dialog_drc.cpp:165 +msgid "Include zones" +msgstr "Inclure zones" -#: pcbnew/router.cpp:572 -msgid "Reading autorouter data file " -msgstr "Lecture fichier données de l'autorouteur" +#: pcbnew/block.cpp:134 +msgid "Include Text on copper layers" +msgstr "Inclure Texte sur couches cuivre" + +#: pcbnew/block.cpp:138 +msgid "Include drawings" +msgstr "Inclure tracés" + +#: pcbnew/block.cpp:142 +msgid "Include egde layer" +msgstr "Inclure couche Edge" + +#: pcbnew/block.cpp:449 +msgid "Delete Block" +msgstr "Effacer Bloc" + +#: pcbnew/block.cpp:460 +msgid "Delete Footprints" +msgstr "Suppression modules" + +#: pcbnew/block.cpp:480 +msgid "Delete tracks" +msgstr "Suppression Pistes" + +#: pcbnew/block.cpp:500 +msgid "Delete draw layers" +msgstr "Suppression couches sessin" + +#: pcbnew/block.cpp:565 +msgid "Delete zones" +msgstr "SuppressionZones" + +#: pcbnew/block.cpp:600 +msgid "Rotate Block" +msgstr "Rotation Bloc" + +#: pcbnew/block.cpp:615 +msgid "Footprint rotation" +msgstr "Rotation modules" + +#: pcbnew/block.cpp:649 +msgid "Track rotation" +msgstr "Rotation pistes" + +#: pcbnew/block.cpp:670 +msgid "Zone rotation" +msgstr "Rotation Zones" + +#: pcbnew/block.cpp:691 +msgid "Draw layers rotation" +msgstr "Rotation couches dessin" + +#: pcbnew/block.cpp:810 +msgid "Block mirroring" +msgstr "Bloc Miroir" + +#: pcbnew/block.cpp:825 +msgid "Footprint mirroring" +msgstr "Miroir modules" + +#: pcbnew/block.cpp:858 +msgid "Track mirroring" +msgstr "Miroir Pistes" + +#: pcbnew/block.cpp:884 +msgid "Zone mirroring" +msgstr "Miroir zone" + +#: pcbnew/block.cpp:906 +msgid "Draw layers mirroring" +msgstr "Draw layers mirroring" + +#: pcbnew/block.cpp:1033 +msgid "Move Block" +msgstr "Déplacer Bloc" + +#: pcbnew/block.cpp:1045 +msgid "Move footprints" +msgstr "Déplacement modules" + +#: pcbnew/block.cpp:1078 +msgid "Move tracks" +msgstr "Déplacement pistes" + +#: pcbnew/block.cpp:1099 +msgid "Move zones" +msgstr "Déplacement zones" + +#: pcbnew/block.cpp:1120 +msgid "Move draw layers" +msgstr "Déplacement couches dessin" + +#: pcbnew/block.cpp:1225 +msgid "Copy Block" +msgstr "Copie Bloc" + +#: pcbnew/block.cpp:1237 +msgid "Module copy" +msgstr "Copie Modules" + +#: pcbnew/block.cpp:1276 +msgid "Track copy" +msgstr "Copie Piste" + +#: pcbnew/block.cpp:1300 +msgid "Zone copy" +msgstr "Copie Zone" + +#: pcbnew/block.cpp:1325 +msgid "Draw layers copy" +msgstr "Cpoie des couches dessin" #: pcbnew/plotgerb.cpp:72 msgid "unable to create file " @@ -2207,210 +2188,17 @@ msgstr "Impossible de cr msgid "unable to reopen file <%s>" msgstr "Ne peut pas réouvrir fichier <%s>" -#: pcbnew/muonde.cpp:149 -msgid "Gap" -msgstr "Gap" - -#: pcbnew/muonde.cpp:154 -msgid "Stub" -msgstr "Stub" - -#: pcbnew/muonde.cpp:160 -msgid "Arc Stub" -msgstr "Arc Stub" - -#: pcbnew/muonde.cpp:175 -#: common/common.cpp:52 -msgid " (mm):" -msgstr " (mm):" - -#: pcbnew/muonde.cpp:182 -msgid " (inch):" -msgstr " (pouce):" - -#: pcbnew/muonde.cpp:189 -#: pcbnew/muonde.cpp:202 -#: pcbnew/gen_self.h:231 -msgid "Incorrect number, abort" -msgstr "Nombre incorrect, arret" - -#: pcbnew/muonde.cpp:198 -msgid "Angle (0.1deg):" -msgstr "Angle (0.1deg):" - -#: pcbnew/muonde.cpp:333 -msgid "Complex shape" -msgstr "Formr complexe" - -#: pcbnew/muonde.cpp:359 -msgid "Read Shape Descr File" -msgstr "Lire fichier de description de forme" - -#: pcbnew/muonde.cpp:363 -#: pcbnew/cotation.cpp:119 -#: pcbnew/pcbtexte.cpp:179 -#: pcbnew/dialog_edit_module.cpp:245 -#: pcbnew/dialog_edit_module.cpp:291 -#: eeschema/options.cpp:177 -#: eeschema/dialog_options.cpp:229 -#: eeschema/editpart.cpp:324 -#: eeschema/dialog_edit_component_in_schematic.cpp:182 -#: eeschema/onrightclick.cpp:302 -msgid "Normal" -msgstr "Normal" - -#: pcbnew/muonde.cpp:363 -msgid "Symmetrical" -msgstr "Symétrique" - -#: pcbnew/muonde.cpp:363 -msgid "mirrored" -msgstr "Miroir" - -#: pcbnew/muonde.cpp:365 -msgid "ShapeOption" -msgstr "Option Forme" - -#: pcbnew/muonde.cpp:370 -#: pcbnew/mirepcb.cpp:112 -#: pcbnew/cotation.cpp:131 -#: pcbnew/pcbtexte.cpp:129 -#: eeschema/sheet.cpp:189 -#: eeschema/sheet.cpp:200 -#: eeschema/pinedit-dialog.cpp:273 -#: eeschema/pinedit-dialog.cpp:279 -#: common/wxwineda.cpp:91 -msgid "Size" -msgstr "Taille " - -#: pcbnew/muonde.cpp:432 -msgid "Read descr shape file" -msgstr "Lire fichier de description de forme" - -#: pcbnew/muonde.cpp:448 -msgid "File not found" -msgstr "fichier non trouvé" - -#: pcbnew/muonde.cpp:552 -msgid "Shape has a null size!" -msgstr "La forme a une taille nulle" - -#: pcbnew/muonde.cpp:557 -msgid "Shape has no points!" -msgstr "La forme n'a pas de points" - -#: pcbnew/muonde.cpp:683 -msgid "No pad for this module" -msgstr "Pas de pad dans ce module" - -#: pcbnew/muonde.cpp:688 -msgid "Only one pad for this module" -msgstr "Seulement un pad dans ce module" - -#: pcbnew/muonde.cpp:702 -msgid "Gap (mm):" -msgstr "Gap (mm):" - -#: pcbnew/muonde.cpp:708 -msgid "Gap (inch):" -msgstr "Gap (inch):" - #: pcbnew/solve.cpp:229 msgid "Abort routing?" msgstr "Stopper routage?" -#: pcbnew/zones.cpp:152 -#: pcbnew/zones.cpp:153 -#: pcbnew/zones.cpp:154 -#: pcbnew/zones.cpp:155 -msgid "0.00000" -msgstr "0.00000" +#: pcbnew/pcbtexte.cpp:91 +msgid "TextPCB properties" +msgstr "Propriétés des textes PCB" -#: pcbnew/zones.cpp:159 -msgid "Grid size:" -msgstr "Dim Grille" - -#: pcbnew/zones.cpp:164 -msgid "Zone clearance value (mm):" -msgstr "Valeur isolation zone (mm):" - -#: pcbnew/zones.cpp:181 -msgid "Include Pads" -msgstr "Inclure Pads" - -#: pcbnew/zones.cpp:182 -msgid "Thermal" -msgstr "Thermique" - -#: pcbnew/zones.cpp:183 -msgid "Exclude Pads" -msgstr "Exclure Pads" - -#: pcbnew/zones.cpp:187 -msgid "Pad options:" -msgstr "Options pads" - -#: pcbnew/zones.cpp:192 -#: eeschema/options.cpp:194 -#: eeschema/dialog_options.cpp:257 -msgid "Any" -msgstr "Tout" - -#: pcbnew/zones.cpp:193 -msgid "H , V and 45 deg" -msgstr "H, V et 45 deg" - -#: pcbnew/zones.cpp:197 -msgid "Zone edges orient:" -msgstr "Direction contours zone:" - -#: pcbnew/zones.cpp:209 -msgid "Fill" -msgstr "Remplissage" - -#: pcbnew/zones.cpp:223 -msgid "Update Options" -msgstr "Maj Options" - -#: pcbnew/zones.cpp:232 -msgid "Zone clearance value:" -msgstr "Valeur isolation zone:" - -#: pcbnew/zones.cpp:235 -msgid "Grid :" -msgstr "Grille:" - -#: pcbnew/zones.cpp:400 -msgid "New zone segment width: " -msgstr "Nouvelle largeur des segments zone:" - -#: pcbnew/zones.cpp:601 -msgid "Zone: No net selected" -msgstr "Zone: Net non sélectionné" - -#: pcbnew/zones.cpp:646 -msgid "Delete Current Zone Edges" -msgstr "Effacer contour zone courant" - -#: pcbnew/zones.cpp:914 -msgid "No Net" -msgstr "No Net" - -#: pcbnew/editedge.cpp:167 -msgid "Copper layer global delete not allowed!" -msgstr " Effacement global sur couche cuivre non autorisé" - -#: pcbnew/editedge.cpp:173 -msgid "Segment is being edited" -msgstr "Segment en cours d'édition" - -#: pcbnew/editedge.cpp:177 -msgid "Delete Layer " -msgstr "Effacer Couche" - -#: pcbnew/deltrack.cpp:153 -msgid "Delete NET ?" -msgstr "Supprimer Net ?" +#: pcbnew/pcbtexte.cpp:137 +msgid "Position" +msgstr "Position" #: pcbnew/mirepcb.cpp:82 msgid "Mire properties" @@ -2428,23 +2216,21 @@ msgstr "Forme X" msgid "Mire Shape:" msgstr "Forme Mire:" -#: pcbnew/affiche.cpp:34 -msgid "Net Name" -msgstr "Equipot" +#: pcbnew/deltrack.cpp:153 +msgid "Delete NET ?" +msgstr "Supprimer Net ?" -#: pcbnew/affiche.cpp:36 -msgid "No Net (not connected)" -msgstr "Pas de Net (non connecté)" +#: pcbnew/editedge.cpp:167 +msgid "Copper layer global delete not allowed!" +msgstr " Effacement global sur couche cuivre non autorisé" -#: pcbnew/affiche.cpp:39 -msgid "Net Code" -msgstr "Net Code" +#: pcbnew/editedge.cpp:173 +msgid "Segment is being edited" +msgstr "Segment en cours d'édition" -#: pcbnew/affiche.cpp:52 -#: pcbnew/class_module.cpp:1127 -#: pcbnew/class_board.cpp:278 -msgid "Pads" -msgstr "Pads" +#: pcbnew/editedge.cpp:177 +msgid "Delete Layer " +msgstr "Effacer Couche" #: pcbnew/xchgmod.cpp:80 msgid "Exchange Modules" @@ -2528,6 +2314,107 @@ msgstr "Pas de Modules" msgid "Cmp files:" msgstr "Fichiers Cmp: " +#: pcbnew/affiche.cpp:34 +msgid "Net Name" +msgstr "Equipot" + +#: pcbnew/affiche.cpp:36 +msgid "No Net (not connected)" +msgstr "Pas de Net (non connecté)" + +#: pcbnew/affiche.cpp:39 +msgid "Net Code" +msgstr "Net Code" + +#: pcbnew/affiche.cpp:52 +#: pcbnew/class_board.cpp:304 +#: pcbnew/class_module.cpp:1127 +msgid "Pads" +msgstr "Pads" + +#: pcbnew/muonde.cpp:149 +msgid "Gap" +msgstr "Gap" + +#: pcbnew/muonde.cpp:154 +msgid "Stub" +msgstr "Stub" + +#: pcbnew/muonde.cpp:160 +msgid "Arc Stub" +msgstr "Arc Stub" + +#: pcbnew/muonde.cpp:175 +#: common/common.cpp:52 +msgid " (mm):" +msgstr " (mm):" + +#: pcbnew/muonde.cpp:182 +msgid " (inch):" +msgstr " (pouce):" + +#: pcbnew/muonde.cpp:189 +#: pcbnew/muonde.cpp:202 +#: pcbnew/gen_self.h:231 +msgid "Incorrect number, abort" +msgstr "Nombre incorrect, arret" + +#: pcbnew/muonde.cpp:198 +msgid "Angle (0.1deg):" +msgstr "Angle (0.1deg):" + +#: pcbnew/muonde.cpp:333 +msgid "Complex shape" +msgstr "Formr complexe" + +#: pcbnew/muonde.cpp:359 +msgid "Read Shape Descr File" +msgstr "Lire fichier de description de forme" + +#: pcbnew/muonde.cpp:363 +msgid "Symmetrical" +msgstr "Symétrique" + +#: pcbnew/muonde.cpp:363 +msgid "mirrored" +msgstr "Miroir" + +#: pcbnew/muonde.cpp:365 +msgid "ShapeOption" +msgstr "Option Forme" + +#: pcbnew/muonde.cpp:432 +msgid "Read descr shape file" +msgstr "Lire fichier de description de forme" + +#: pcbnew/muonde.cpp:448 +msgid "File not found" +msgstr "fichier non trouvé" + +#: pcbnew/muonde.cpp:552 +msgid "Shape has a null size!" +msgstr "La forme a une taille nulle" + +#: pcbnew/muonde.cpp:557 +msgid "Shape has no points!" +msgstr "La forme n'a pas de points" + +#: pcbnew/muonde.cpp:683 +msgid "No pad for this module" +msgstr "Pas de pad dans ce module" + +#: pcbnew/muonde.cpp:688 +msgid "Only one pad for this module" +msgstr "Seulement un pad dans ce module" + +#: pcbnew/muonde.cpp:702 +msgid "Gap (mm):" +msgstr "Gap (mm):" + +#: pcbnew/muonde.cpp:708 +msgid "Gap (inch):" +msgstr "Gap (inch):" + #: pcbnew/set_grid.cpp:147 #: pcbnew/dialog_general_options.cpp:270 #: gerbview/options.cpp:183 @@ -2535,7 +2422,7 @@ msgid "Inches" msgstr "Pouces" #: pcbnew/set_grid.cpp:148 -#: share/drawframe.cpp:376 +#: share/drawframe.cpp:381 msgid "mm" msgstr "mm" @@ -2559,6 +2446,14 @@ msgstr "Num Pad :" msgid "Pad Net Name :" msgstr "NetName Pad:" +#: pcbnew/dialog_pad_edit.cpp:176 +#: pcbnew/dialog_pad_edit.cpp:196 +#: pcbnew/classpcb.cpp:186 +#: pcbnew/class_board_item.cpp:100 +#: pcbnew/class_track.cpp:725 +msgid "Circle" +msgstr "Cercle" + #: pcbnew/dialog_pad_edit.cpp:177 #: pcbnew/dialog_pad_edit.cpp:197 msgid "Oval" @@ -2604,6 +2499,11 @@ msgstr "Trapezoidal" msgid "Pad Shape:" msgstr "Forme Pad:" +#: pcbnew/dialog_pad_edit.cpp:205 +#: pcbnew/class_track.cpp:727 +msgid "Standard" +msgstr "Standard" + #: pcbnew/dialog_pad_edit.cpp:206 msgid "SMD" msgstr "CMS" @@ -2681,41 +2581,35 @@ msgstr "couche E.C.O.2" msgid "Draft layer" msgstr "Couche dessin" -#: pcbnew/files.cpp:57 -msgid "Recovery file " -msgstr "Fichier de secours " +#: pcbnew/classpcb.cpp:181 +#: pcbnew/classpcb.cpp:313 +#: pcbnew/class_track.cpp:699 +#: pcbnew/class_text_mod.cpp:337 +#: gerbview/affiche.cpp:93 +msgid "Type" +msgstr "Type" -#: pcbnew/files.cpp:63 -msgid "Ok to load Recovery file " -msgstr "Ok pour charger le fichier de secours" +#: pcbnew/classpcb.cpp:183 +msgid "Shape" +msgstr "Forme" -#: pcbnew/files.cpp:143 -msgid "Board Modified: Continue ?" -msgstr "Circuit imprimé modifié, Continuer ?" +#: pcbnew/classpcb.cpp:190 +msgid " Arc " +msgstr " Arc " -#: pcbnew/files.cpp:161 -msgid "Load board files:" -msgstr "Charger Fichiers C.I.:" +#: pcbnew/classpcb.cpp:195 +#: pcbnew/class_track.cpp:723 +msgid "Segment" +msgstr "Segment" -#: pcbnew/files.cpp:263 -msgid "Save board files:" -msgstr "Sauver Fichiers C.I.:" +#: pcbnew/classpcb.cpp:313 +#: pcbnew/class_board_item.cpp:182 +msgid "Marker" +msgstr "Marqueur" -#: pcbnew/files.cpp:299 -msgid "Warning: unable to create bakfile " -msgstr "Attention: Impossible de créer fichier backup " - -#: pcbnew/files.cpp:335 -msgid "Backup file: " -msgstr "Fichier backup: " - -#: pcbnew/files.cpp:340 -msgid "Write Board file: " -msgstr "Ecriture fichier CI: " - -#: pcbnew/files.cpp:342 -msgid "Failed to create " -msgstr "Impossible de créer fichier " +#: pcbnew/classpcb.cpp:316 +msgid "Marker Error Text" +msgstr "Texte du Marqueur d'erreurs" #: pcbnew/pcbcfg.cpp:68 #: eeschema/eeconfig.cpp:58 @@ -2769,79 +2663,326 @@ msgstr "Librairie: " msgid "Modules (%d items)" msgstr "Modules (%d éléments)" -#: pcbnew/controle.cpp:49 +#: pcbnew/files.cpp:57 +msgid "Recovery file " +msgstr "Fichier de secours " + +#: pcbnew/files.cpp:63 +msgid "Ok to load Recovery file " +msgstr "Ok pour charger le fichier de secours" + +#: pcbnew/files.cpp:143 +msgid "Board Modified: Continue ?" +msgstr "Circuit imprimé modifié, Continuer ?" + +#: pcbnew/files.cpp:161 +msgid "Load board files:" +msgstr "Charger Fichiers C.I.:" + +#: pcbnew/files.cpp:263 +msgid "Save board files:" +msgstr "Sauver Fichiers C.I.:" + +#: pcbnew/files.cpp:299 +msgid "Warning: unable to create bakfile " +msgstr "Attention: Impossible de créer fichier backup " + +#: pcbnew/files.cpp:335 +msgid "Backup file: " +msgstr "Fichier backup: " + +#: pcbnew/files.cpp:340 +msgid "Write Board file: " +msgstr "Ecriture fichier CI: " + +#: pcbnew/files.cpp:342 +msgid "Failed to create " +msgstr "Impossible de créer fichier " + +#: pcbnew/dialog_edit_module.cpp:40 +msgid "Module properties" +msgstr "Propriétés du Module" + +#: pcbnew/dialog_edit_module.cpp:95 +msgid "Properties" +msgstr "Propriétés" + +#: pcbnew/dialog_edit_module.cpp:99 +#: pcbnew/dialog_edit_module.cpp:108 +#: pcbnew/dialog_edit_module.cpp:139 +msgid "3D settings" +msgstr "3D Caract" + +#: pcbnew/dialog_edit_module.cpp:184 +msgid "Change module(s)" +msgstr "Change module(s)" + +#: pcbnew/dialog_edit_module.cpp:188 +#: pcbnew/modedit_onclick.cpp:260 +msgid "Edit Module" +msgstr "Edit Module" + +#: pcbnew/dialog_edit_module.cpp:195 +#: eeschema/dialog_edit_component_in_lib.cpp:203 +#: eeschema/libedpart.cpp:252 +#: eeschema/onrightclick.cpp:347 +msgid "Doc" +msgstr "Doc" + +#: pcbnew/dialog_edit_module.cpp:202 +msgid "Keywords" +msgstr "Mots Cles" + +#: pcbnew/dialog_edit_module.cpp:209 +msgid "Fields:" +msgstr "Champs:" + +#: pcbnew/dialog_edit_module.cpp:219 +msgid "Add Field" +msgstr "Ajouter Champ" + +#: pcbnew/dialog_edit_module.cpp:224 +#: eeschema/onrightclick.cpp:267 +msgid "Edit Field" +msgstr "Editer Champ" + +#: pcbnew/dialog_edit_module.cpp:229 +msgid "Delete Field" +msgstr "Supprimer Champ" + +#: pcbnew/dialog_edit_module.cpp:236 +#: common/common.cpp:280 +msgid "Component" +msgstr "Composant" + +#: pcbnew/dialog_edit_module.cpp:236 +msgid "Copper" +msgstr "Cuivre" + +#: pcbnew/dialog_edit_module.cpp:281 +msgid "Orient (0.1 deg)" +msgstr "Orient (0.1 deg)" + +#: pcbnew/dialog_edit_module.cpp:291 +msgid "Normal+Insert" +msgstr "Normal+Insert" + +#: pcbnew/dialog_edit_module.cpp:291 +msgid "Virtual" +msgstr "Virtuel" + +#: pcbnew/dialog_edit_module.cpp:292 +msgid "Attributes" +msgstr "Attributs" + +#: pcbnew/dialog_edit_module.cpp:295 +msgid "Use this attribute for most non smd components" +msgstr "Utiliser cet attribut pour la plupart des composants" + +#: pcbnew/dialog_edit_module.cpp:297 +msgid "" +"Use this attribute for smd components.\n" +"Only components with this option are put in the footprint position list file" +msgstr "" +"Uiliser cet attribut pour les composants CMS.\n" +"Seuls les composants avec cette option sont mis dans le fichier de position des composants" + +#: pcbnew/dialog_edit_module.cpp:299 +msgid "Use this attribute for \"virtual\" components drawn on board (like a old ISA PC bus connector)" +msgstr "Uiliser cet attribut pour les composants \"virtuels\" directement dessinés sur le PCB (tel que les vieux connecteurs ISA de PC)" + +#: pcbnew/dialog_edit_module.cpp:323 +msgid "Free" +msgstr "Libre" + +#: pcbnew/dialog_edit_module.cpp:323 +msgid "Locked" +msgstr "Verrouillé" + +#: pcbnew/dialog_edit_module.cpp:325 +msgid "Move and Auto Place" +msgstr "Move et Placement Automatique" + +#: pcbnew/dialog_edit_module.cpp:330 +msgid "Enable hotkey move commands and Auto Placement" +msgstr "Autoriser les commandes clavier de déplacement et l'auto placement" + +#: pcbnew/dialog_edit_module.cpp:331 +msgid "Disable hotkey move commands and Auto Placement" +msgstr "Interdire les commandes clavier de déplacement et l'auto placement" + +#: pcbnew/dialog_edit_module.cpp:335 +msgid "Rot 90" +msgstr "Rot 90" + +#: pcbnew/dialog_edit_module.cpp:343 +msgid "Rot 180" +msgstr "Rot 180" + +#: pcbnew/dialog_edit_module.cpp:380 +msgid "3D Shape Name" +msgstr "3D forme" + +#: pcbnew/dialog_edit_module.cpp:397 +#: pcbnew/dialog_drc.cpp:208 +#: eeschema/dialog_eeschema_config.cpp:227 +msgid "Browse" +msgstr "Examiner" + +#: pcbnew/dialog_edit_module.cpp:401 +msgid "Add 3D Shape" +msgstr "Ajout Forme 3D" + +#: pcbnew/dialog_edit_module.cpp:407 +msgid "Remove 3D Shape" +msgstr "Suppr. Forme 3D:" + +#: pcbnew/dialog_edit_module.cpp:413 +msgid "Shape Scale:" +msgstr "Echelle de la forme:" + +#: pcbnew/dialog_edit_module.cpp:420 +msgid "Shape Offset:" +msgstr "Offset forme:" + +#: pcbnew/dialog_edit_module.cpp:429 +msgid "Shape Rotation:" +msgstr "Rot de la forme" + +#: pcbnew/dialog_edit_module.cpp:469 +msgid "3D Shape:" +msgstr "Forme 3D:" + +#: pcbnew/dialog_edit_module.cpp:774 +msgid "Reference or Value cannot be deleted" +msgstr "Référence ou Valeur ne peut etre effacée" + +#: pcbnew/dialog_edit_module.cpp:778 +#, c-format +msgid "Delete [%s]" +msgstr "Supprimer [%s]" + +#: pcbnew/controle.cpp:52 #, c-format msgid "Locate module %s %s" msgstr "Module localisé %s %s" -#: pcbnew/controle.cpp:102 +#: pcbnew/controle.cpp:105 #, c-format msgid "module %s not found" msgstr "module %s non trouvé" -#: pcbnew/controle.cpp:104 +#: pcbnew/controle.cpp:107 #, c-format msgid "Pin %s (module %s) not found" msgstr "Pin %s (module %s) non trouvée" -#: pcbnew/controle.cpp:106 +#: pcbnew/controle.cpp:109 #, c-format msgid "Locate Pin %s (module %s)" msgstr "Pin localisée %s (module %s)" -#: pcbnew/controle.cpp:253 +#: pcbnew/controle.cpp:271 msgid "Selection Clarification" msgstr "Clarification de la Sélection" -#: pcbnew/edit.cpp:166 -msgid "Graphic not autorized on Copper layers" -msgstr "Graphique non autorisé sur couches cuivre" +#: pcbnew/drc.cpp:80 +msgid "Look for active routes\n" +msgstr "Recherche des chevelus actifs\n" -#: pcbnew/edit.cpp:189 -msgid "Tracks on Copper layers only " -msgstr "Pistes sur couches cuivre seulement" +#: pcbnew/drc.cpp:92 +msgid "Unconnected found:\n" +msgstr "Non connecté trouvé:\n" -#: pcbnew/edit.cpp:265 -msgid "Cotation not autorized on Copper layers" -msgstr "Cotation non autorisée sur couches cuivre" +#: pcbnew/drc.cpp:97 +#, c-format +msgid "%d > Pad %s (%s) @ %.4f,%.4f and " +msgstr "%d > Pad %s (%s) @ %.4f,%.4f et " + +#: pcbnew/drc.cpp:108 +#, c-format +msgid "Pad %s (%s) @ %.4f,%.4f\n" +msgstr "Pad %s (%s) @ %.4f,%.4f\n" + +#: pcbnew/drc.cpp:117 +#, c-format +msgid "Active routes: %d\n" +msgstr "Active routes: %d\n" + +#: pcbnew/drc.cpp:119 +msgid "OK! (No active routes)\n" +msgstr "OK! (Pas de chevelu actif)\n" + +#: pcbnew/drc.cpp:171 +#, c-format +msgid "** End Drc: %d errors **\n" +msgstr "** FinDrc: %d erreurs **\n" + +#: pcbnew/drc.cpp:173 +msgid "** End Drc: No Error **\n" +msgstr "** Fin Drc: Aucune Erreur **\n" + +#: pcbnew/drc.cpp:182 +#, c-format +msgid "Report file <%s> created\n" +msgstr "Fichier rapport <%s> créé\n" + +#: pcbnew/drc.cpp:264 +msgid "Tst Pad to Pad\n" +msgstr "Tst Pad to Pad\n" + +#: pcbnew/drc.cpp:309 +#: pcbnew/drc.cpp:382 +msgid "SegmNb" +msgstr "SegmNb" + +#: pcbnew/drc.cpp:310 +msgid "Track Err" +msgstr "Err Pistes" + +#: pcbnew/drc.cpp:314 +msgid "Tst Tracks\n" +msgstr "Tst Pistes\n" + +#: pcbnew/drc.cpp:344 +#: pcbnew/drc.cpp:420 +#: eeschema/eelayer.cpp:141 +msgid "Netname" +msgstr "NetName" + +#: pcbnew/drc.cpp:383 +msgid "Zone Err" +msgstr "Err. Zone" + +#: pcbnew/drc.cpp:386 +msgid "Tst Zones\n" +msgstr "Test Zones\n" + +#: pcbnew/drc.cpp:1367 +#, fuzzy, c-format +msgid "%d Drc Err %d %s (net %s) and PAD %s (%s) net %s @ %d,%d\n" +msgstr "%d Err Drc %d %s (net %s) et PAD %s (%s) net %s @ %d,%d\n" + +#: pcbnew/drc.cpp:1384 +#, c-format +msgid "%d Err type %d: %s (net %s) and VIA (net %s) @ %d,%d\n" +msgstr "%d Err type %d: %s (net %s) et VIA (net %s) @ %d,%d\n" + +#: pcbnew/drc.cpp:1400 +#, c-format +msgid "%d Err type %d: %s (net %s) and track (net %s) @ %d,%d\n" +msgstr "%d Err type %d: %s (net %s) et piste (net %s) @ %d,%d\n" + +#: pcbnew/drc.cpp:1458 +#, c-format +msgid "%d Drc Err: PAD %s (%s) net %s @ %d,%d and PAD %s (%s) net %s @ %d,%d\n" +msgstr "%d Err Drc: PAD %s (%s) net %s @ %d,%d et PAD %s (%s) net %s @ %d,%d\n" -#: pcbnew/edit.cpp:487 #: pcbnew/editmod.cpp:45 +#: pcbnew/edit.cpp:236 msgid "Module Editor" msgstr "Ouvrir Editeur de modules" -#: pcbnew/edit.cpp:566 -msgid "Add Tracks" -msgstr "Addition de pistes" - -#: pcbnew/edit.cpp:577 -msgid "Warning: Display Zone is OFF!!!" -msgstr "Attention: Affichage zones désactivé !!!" - -#: pcbnew/edit.cpp:584 -msgid "Add Mire" -msgstr "Ajouter Mires de superposition" - -#: pcbnew/edit.cpp:588 -msgid "Adjust Zero" -msgstr "Ajuster Zéro" - -#: pcbnew/edit.cpp:594 -msgid "Add Graphic" -msgstr "Addition éléments graphiques" - -#: pcbnew/edit.cpp:602 -msgid "Add Modules" -msgstr "Addition de Modules" - -#: pcbnew/edit.cpp:614 -msgid "Net Highlight" -msgstr "Surbrillance des équipotentielles" - -#: pcbnew/edit.cpp:618 -msgid "Local Ratsnest" -msgstr "Monter le chevelu général" - #: pcbnew/editmod.cpp:144 msgid "Text is REFERENCE!" msgstr "Le texte est la REFERENCE!" @@ -3055,7 +3196,7 @@ msgstr "Ajuster dims et taille des pistes et vias" #: pcbnew/menubarpcb.cpp:199 #: pcbnew/menubarmodedit.cpp:50 -#: pcbnew/set_grid.h:40 +#: pcbnew/set_grid.h:39 msgid "User Grid Size" msgstr "Dim Grille utilisteur" @@ -3065,7 +3206,7 @@ msgid "Adjust User Grid" msgstr "Ajuster Grille utilisateur" #: pcbnew/menubarpcb.cpp:204 -#: pcbnew/dialog_graphic_items_options.h:39 +#: pcbnew/dialog_graphic_items_options.h:38 msgid "Texts and Drawings" msgstr "Textes et Tracés" @@ -3231,15 +3372,6 @@ msgstr "&3D Visu" msgid "&Help" msgstr "&Aide" -#: pcbnew/cotation.cpp:89 -msgid "Cotation properties" -msgstr "Propriétés des Cotations" - -#: pcbnew/cotation.cpp:139 -#: gerbview/affiche.cpp:37 -msgid "Layer:" -msgstr "Couche:" - #: pcbnew/set_color.cpp:50 msgid "Copper Layers" msgstr "Couches Cuivre." @@ -3307,13 +3439,37 @@ msgstr "Rien Afficher" msgid "Exit" msgstr "Quitter" -#: pcbnew/pcbtexte.cpp:91 -msgid "TextPCB properties" -msgstr "Propriétés des textes PCB" +#: pcbnew/edit.cpp:316 +msgid "Add Tracks" +msgstr "Addition de pistes" -#: pcbnew/pcbtexte.cpp:137 -msgid "Position" -msgstr "Position" +#: pcbnew/edit.cpp:327 +msgid "Warning: Display Zone is OFF!!!" +msgstr "Attention: Affichage zones désactivé !!!" + +#: pcbnew/edit.cpp:334 +msgid "Add Mire" +msgstr "Ajouter Mires de superposition" + +#: pcbnew/edit.cpp:338 +msgid "Adjust Zero" +msgstr "Ajuster Zéro" + +#: pcbnew/edit.cpp:344 +msgid "Add Graphic" +msgstr "Addition éléments graphiques" + +#: pcbnew/edit.cpp:352 +msgid "Add Modules" +msgstr "Addition de Modules" + +#: pcbnew/edit.cpp:364 +msgid "Net Highlight" +msgstr "Surbrillance des équipotentielles" + +#: pcbnew/edit.cpp:368 +msgid "Local Ratsnest" +msgstr "Monter le chevelu général" #: pcbnew/automove.cpp:212 msgid "Move Modules ?" @@ -3328,38 +3484,88 @@ msgstr "Autoplace modules: pas de contours sur pcb, impossible de placer les mod msgid "Ok to set module orientation to %d degrees ?" msgstr "Ok pour orientation module à %d degrés ?" -#: pcbnew/class_pad.cpp:732 -msgid "Unknown Pad shape" -msgstr "Forme pad inconnue" - -#: pcbnew/class_pad.cpp:818 -#: pcbnew/class_edge_mod.cpp:285 -#: pcbnew/class_text_mod.cpp:328 -#: pcbnew/class_module.cpp:1142 -#: cvpcb/setvisu.cpp:29 -msgid "Module" +#: pcbnew/class_board_item.cpp:40 +#: eeschema/component_class.cpp:56 +msgid "Footprint" msgstr "Module" -#: pcbnew/class_pad.cpp:821 -msgid "RefP" -msgstr "RefP" +#: pcbnew/class_board_item.cpp:45 +msgid "Pad" +msgstr "Pad" -#: pcbnew/class_pad.cpp:824 -#: pcbnew/class_board_item.cpp:35 -msgid "Net" -msgstr "Net" +#: pcbnew/class_board_item.cpp:45 +#: pcbnew/class_board_item.cpp:71 +#: pcbnew/class_board_item.cpp:77 +#: pcbnew/class_board_item.cpp:122 +msgid " of " +msgstr " de " -#: pcbnew/class_pad.cpp:938 -msgid "Drill X / Y" -msgstr "Perçage X/Y" +#: pcbnew/class_board_item.cpp:50 +msgid "Pcb Graphic" +msgstr "Pcb Graphic" -#: pcbnew/class_pad.cpp:953 -msgid "X Pos" -msgstr "X Pos" +#: pcbnew/class_board_item.cpp:50 +#: pcbnew/class_board_item.cpp:59 +#: pcbnew/class_board_item.cpp:133 +#: pcbnew/class_board_item.cpp:148 +#: pcbnew/class_board_item.cpp:175 +#: pcbnew/class_board_item.cpp:194 +msgid " on " +msgstr " sur " -#: pcbnew/class_pad.cpp:957 -msgid "Y pos" -msgstr "Y pos" +#: pcbnew/class_board_item.cpp:54 +msgid "Pcb Text" +msgstr "Texte Pcb" + +#: pcbnew/class_board_item.cpp:71 +#: pcbnew/class_edge_mod.cpp:286 +#: pcbnew/class_text_mod.cpp:323 +#: eeschema/editpart.cpp:777 +#: eeschema/eelayer.cpp:105 +#: eeschema/component_class.cpp:55 +#: eeschema/onrightclick.cpp:315 +#: eeschema/edit_component_in_schematic.cpp:784 +msgid "Value" +msgstr "Valeur" + +#: pcbnew/class_board_item.cpp:76 +#: pcbnew/class_text_mod.cpp:323 +#: pcbnew/class_text_mod.cpp:331 +msgid "Text" +msgstr "Texte" + +#: pcbnew/class_board_item.cpp:85 +msgid "Graphic" +msgstr "Graphique" + +#: pcbnew/class_board_item.cpp:97 +msgid "Arc" +msgstr "Arc" + +#: pcbnew/class_board_item.cpp:137 +#: pcbnew/class_track.cpp:692 +msgid "Zone" +msgstr "Zone" + +#: pcbnew/class_board_item.cpp:158 +msgid "Blind" +msgstr "Enterrée" + +#: pcbnew/class_board_item.cpp:160 +msgid "Buried" +msgstr "Borgne" + +#: pcbnew/class_board_item.cpp:186 +msgid "Dimension" +msgstr "Dimension" + +#: pcbnew/class_board_item.cpp:190 +msgid "Mire" +msgstr "Mire" + +#: pcbnew/class_board_item.cpp:194 +msgid "Edge Zone" +msgstr "Contour Zone" #: pcbnew/pcbplot.cpp:115 #: pcbnew/pcbplot.cpp:205 @@ -3578,39 +3784,39 @@ msgid "Draw origin ( 0,0 ) in sheet center" msgstr "Origine des tracés au centre de la feuille" #: pcbnew/modedit_onclick.cpp:206 -#: pcbnew/onrightclick.cpp:138 +#: pcbnew/onrightclick.cpp:147 #: eeschema/libedit_onrightclick.cpp:73 -#: eeschema/onrightclick.cpp:118 +#: eeschema/onrightclick.cpp:125 #: gerbview/onrightclick.cpp:42 msgid "End Tool" msgstr "Fin Outil" #: pcbnew/modedit_onclick.cpp:216 -#: pcbnew/onrightclick.cpp:445 +#: pcbnew/onrightclick.cpp:444 #: eeschema/libedit_onrightclick.cpp:251 -#: eeschema/onrightclick.cpp:578 +#: eeschema/onrightclick.cpp:580 #: gerbview/onrightclick.cpp:51 msgid "Cancel Block" msgstr "Annuler Bloc" #: pcbnew/modedit_onclick.cpp:218 -#: pcbnew/onrightclick.cpp:447 +#: pcbnew/onrightclick.cpp:446 #: gerbview/onrightclick.cpp:52 msgid "Zoom Block (Midd butt drag)" msgstr "Zoom Bloc (drag+bouton milieu)" #: pcbnew/modedit_onclick.cpp:221 -#: pcbnew/onrightclick.cpp:450 +#: pcbnew/onrightclick.cpp:449 #: eeschema/libedit_onrightclick.cpp:259 -#: eeschema/onrightclick.cpp:586 +#: eeschema/onrightclick.cpp:588 #: gerbview/onrightclick.cpp:54 msgid "Place Block" msgstr "Place Bloc" #: pcbnew/modedit_onclick.cpp:223 -#: pcbnew/onrightclick.cpp:452 +#: pcbnew/onrightclick.cpp:451 #: eeschema/libedit_onrightclick.cpp:265 -#: eeschema/onrightclick.cpp:595 +#: eeschema/onrightclick.cpp:597 msgid "Copy Block (shift + drag mouse)" msgstr "Copie Bloc (shift + drag mouse)" @@ -3619,18 +3825,18 @@ msgid "Mirror Block (alt + drag mouse)" msgstr "Bloc Miroir (alt + drag mouse)" #: pcbnew/modedit_onclick.cpp:227 -#: pcbnew/onrightclick.cpp:456 +#: pcbnew/onrightclick.cpp:455 msgid "Rotate Block (ctrl + drag mouse)" msgstr "Rotation Bloc (ctrl + drag mouse)" #: pcbnew/modedit_onclick.cpp:229 -#: pcbnew/onrightclick.cpp:458 +#: pcbnew/onrightclick.cpp:457 msgid "Delete Block (shift+ctrl + drag mouse)" msgstr "Effacement Bloc (shift+ctrl + drag mouse)" #: pcbnew/modedit_onclick.cpp:251 -#: pcbnew/onrightclick.cpp:664 -#: pcbnew/onrightclick.cpp:761 +#: pcbnew/onrightclick.cpp:663 +#: pcbnew/onrightclick.cpp:760 msgid "Rotate" msgstr "Rotation" @@ -3646,10 +3852,6 @@ msgstr "Echelle X" msgid "Scale Y" msgstr "Echelle Y" -#: pcbnew/modedit_onclick.cpp:260 -msgid "Edit Module" -msgstr "Edit Module" - #: pcbnew/modedit_onclick.cpp:263 msgid "Transform Module" msgstr "Transforme Module" @@ -3659,17 +3861,17 @@ msgid "Move Pad" msgstr "Déplace Pad" #: pcbnew/modedit_onclick.cpp:273 -#: pcbnew/onrightclick.cpp:703 +#: pcbnew/onrightclick.cpp:702 msgid "Edit Pad" msgstr "Edit Pad" #: pcbnew/modedit_onclick.cpp:275 -#: pcbnew/onrightclick.cpp:707 +#: pcbnew/onrightclick.cpp:706 msgid "New Pad Settings" msgstr "Nouvelles Caract. Pads" #: pcbnew/modedit_onclick.cpp:277 -#: pcbnew/onrightclick.cpp:709 +#: pcbnew/onrightclick.cpp:708 msgid "Export Pad Settings" msgstr "Exporte Caract. Pads" @@ -3678,7 +3880,7 @@ msgid "delete Pad" msgstr "Supprimer Pad" #: pcbnew/modedit_onclick.cpp:284 -#: pcbnew/onrightclick.cpp:714 +#: pcbnew/onrightclick.cpp:713 msgid "Global Pad Settings" msgstr "Edition Globale des pads" @@ -3711,10 +3913,10 @@ msgid "Place edge" msgstr "Place contour" #: pcbnew/modedit_onclick.cpp:316 -#: pcbnew/onrightclick.cpp:632 -#: pcbnew/onrightclick.cpp:666 -#: pcbnew/onrightclick.cpp:763 -#: eeschema/onrightclick.cpp:309 +#: pcbnew/onrightclick.cpp:631 +#: pcbnew/onrightclick.cpp:665 +#: pcbnew/onrightclick.cpp:762 +#: eeschema/onrightclick.cpp:311 msgid "Edit" msgstr "Editer" @@ -3814,142 +4016,18 @@ msgstr "Largeur Texte Module" msgid "GenCAD file:" msgstr "Fichier GenCAD:" -#: pcbnew/class_board_item.cpp:40 -#: eeschema/component_class.cpp:56 -msgid "Footprint" -msgstr "Module" +#: pcbnew/class_track.cpp:719 +msgid "NetCode" +msgstr "NetCode" -#: pcbnew/class_board_item.cpp:45 -msgid "Pad" -msgstr "Pad" +#: pcbnew/class_track.cpp:739 +#: pcbnew/class_module.cpp:1135 +msgid "Stat" +msgstr "Stat" -#: pcbnew/class_board_item.cpp:45 -#: pcbnew/class_board_item.cpp:71 -#: pcbnew/class_board_item.cpp:77 -#: pcbnew/class_board_item.cpp:122 -msgid " of " -msgstr " de " - -#: pcbnew/class_board_item.cpp:50 -msgid "Pcb Graphic" -msgstr "Pcb Graphic" - -#: pcbnew/class_board_item.cpp:50 -#: pcbnew/class_board_item.cpp:59 -#: pcbnew/class_board_item.cpp:133 -#: pcbnew/class_board_item.cpp:137 -#: pcbnew/class_board_item.cpp:162 -msgid " on " -msgstr " sur " - -#: pcbnew/class_board_item.cpp:54 -msgid "Pcb Text" -msgstr "Texte Pcb" - -#: pcbnew/class_board_item.cpp:71 -#: pcbnew/class_edge_mod.cpp:286 -#: pcbnew/class_text_mod.cpp:323 -#: eeschema/editpart.cpp:777 -#: eeschema/eelayer.cpp:105 -#: eeschema/component_class.cpp:55 -#: eeschema/onrightclick.cpp:313 -#: eeschema/edit_component_in_schematic.cpp:784 -msgid "Value" -msgstr "Valeur" - -#: pcbnew/class_board_item.cpp:76 -#: pcbnew/class_text_mod.cpp:323 -#: pcbnew/class_text_mod.cpp:331 -msgid "Text" -msgstr "Texte" - -#: pcbnew/class_board_item.cpp:85 -msgid "Graphic" -msgstr "Graphique" - -#: pcbnew/class_board_item.cpp:97 -msgid "Arc" -msgstr "Arc" - -#: pcbnew/class_board_item.cpp:150 -msgid "Marker" -msgstr "Marqueur" - -#: pcbnew/class_board_item.cpp:154 -msgid "Dimension" -msgstr "Dimension" - -#: pcbnew/class_board_item.cpp:158 -msgid "Mire" -msgstr "Mire" - -#: pcbnew/class_board_item.cpp:162 -msgid "Edge Zone" -msgstr "Contour Zone" - -#: pcbnew/dialog_drc.cpp:141 -#: eeschema/editpart.cpp:208 -#: eeschema/dialog_erc.cpp:237 -#: eeschema/dialog_edit_component_in_lib.cpp:166 -#: eeschema/dialog_create_component.cpp:176 -#: eeschema/dialog_edit_component_in_schematic.cpp:204 -#: eeschema/libedpart.cpp:247 -#: eeschema/dialog_build_BOM.cpp:279 -#: cvpcb/dialog_display_options.h:44 -msgid "Options" -msgstr "Options" - -#: pcbnew/dialog_drc.cpp:153 -msgid "Test Drc:" -msgstr "Test Drc:" - -#: pcbnew/dialog_drc.cpp:157 -msgid "Include pad to pad test" -msgstr "Inclure test pad à pad" - -#: pcbnew/dialog_drc.cpp:161 -msgid "Include unconnected" -msgstr "Inclure non connexions" - -#: pcbnew/dialog_drc.cpp:169 -msgid "Create Report file" -msgstr "Créer fichier rapport " - -#: pcbnew/dialog_drc.cpp:182 -msgid "Test Drc" -msgstr "Test Drc" - -#: pcbnew/dialog_drc.cpp:186 -msgid "Stop Drc" -msgstr "Stop Drc" - -#: pcbnew/dialog_drc.cpp:193 -msgid "Del Markers" -msgstr "Supprimer Marqueurs" - -#: pcbnew/dialog_drc.cpp:197 -msgid "List Unconn" -msgstr "Liste Non Conn." - -#: pcbnew/dialog_drc.cpp:204 -msgid "Report File" -msgstr "Fichier rapport" - -#: pcbnew/dialog_drc.cpp:208 -#: pcbnew/dialog_edit_module.cpp:397 -#: eeschema/dialog_eeschema_config.cpp:227 -msgid "Browse" -msgstr "Examiner" - -#: pcbnew/dialog_drc.cpp:215 -#: common/svg_print.cpp:232 -#: share/svg_print.cpp:232 -msgid "Messages:" -msgstr "Messages:" - -#: pcbnew/dialog_drc.cpp:347 -msgid "DRC Report file" -msgstr "Fichier rapport de contrôle DRC:" +#: pcbnew/class_track.cpp:763 +msgid "Diam" +msgstr "Diam" #: pcbnew/globaleditpad.cpp:79 msgid "Pads Global Edit" @@ -4028,162 +4106,6 @@ msgstr "Impossible de drag ce segment: 2 segments align msgid "Module Editor: module modified!, Continue ?" msgstr "Editeur de Module: module modifié! Continuer ?" -#: pcbnew/dialog_edit_module.cpp:40 -msgid "Module properties" -msgstr "Propriétés du Module" - -#: pcbnew/dialog_edit_module.cpp:95 -msgid "Properties" -msgstr "Propriétés" - -#: pcbnew/dialog_edit_module.cpp:99 -#: pcbnew/dialog_edit_module.cpp:108 -#: pcbnew/dialog_edit_module.cpp:139 -msgid "3D settings" -msgstr "3D Caract" - -#: pcbnew/dialog_edit_module.cpp:184 -msgid "Change module(s)" -msgstr "Change module(s)" - -#: pcbnew/dialog_edit_module.cpp:188 -msgid "Goto Module Editor" -msgstr "Ouvrir Editeur de modules" - -#: pcbnew/dialog_edit_module.cpp:195 -#: eeschema/dialog_edit_component_in_lib.cpp:203 -#: eeschema/libedpart.cpp:252 -#: eeschema/onrightclick.cpp:345 -msgid "Doc" -msgstr "Doc" - -#: pcbnew/dialog_edit_module.cpp:202 -msgid "Keywords" -msgstr "Mots Cles" - -#: pcbnew/dialog_edit_module.cpp:209 -msgid "Fields:" -msgstr "Champs:" - -#: pcbnew/dialog_edit_module.cpp:219 -msgid "Add Field" -msgstr "Ajouter Champ" - -#: pcbnew/dialog_edit_module.cpp:224 -#: eeschema/onrightclick.cpp:265 -msgid "Edit Field" -msgstr "Editer Champ" - -#: pcbnew/dialog_edit_module.cpp:229 -msgid "Delete Field" -msgstr "Supprimer Champ" - -#: pcbnew/dialog_edit_module.cpp:236 -#: common/common.cpp:281 -msgid "Component" -msgstr "Composant" - -#: pcbnew/dialog_edit_module.cpp:236 -msgid "Copper" -msgstr "Cuivre" - -#: pcbnew/dialog_edit_module.cpp:281 -msgid "Orient (0.1 deg)" -msgstr "Orient (0.1 deg)" - -#: pcbnew/dialog_edit_module.cpp:291 -msgid "Normal+Insert" -msgstr "Normal+Insert" - -#: pcbnew/dialog_edit_module.cpp:291 -msgid "Virtual" -msgstr "Virtuel" - -#: pcbnew/dialog_edit_module.cpp:292 -msgid "Attributs" -msgstr "Attributs" - -#: pcbnew/dialog_edit_module.cpp:295 -msgid "Use this attribute for most non smd components" -msgstr "Utiliser cet attribut pour la plupart des composants" - -#: pcbnew/dialog_edit_module.cpp:297 -msgid "" -"Use this attribute for smd components.\n" -"Only components with this option are put in the footprint position list file" -msgstr "" -"Uiliser cet attribut pour les composants CMS.\n" -"Seuls les composants avec cette option sont mis dans le fichier de position des composants" - -#: pcbnew/dialog_edit_module.cpp:299 -msgid "Use this attribute for \"virtual\" components drawn on board (like a old ISA PC bus connector)" -msgstr "Uiliser cet attribut pour les composants \"virtuels\" directement dessinés sur le PCB (tel que les vieux connecteurs ISA de PC)" - -#: pcbnew/dialog_edit_module.cpp:323 -msgid "Free" -msgstr "Libre" - -#: pcbnew/dialog_edit_module.cpp:323 -msgid "Locked" -msgstr "Verrouillé" - -#: pcbnew/dialog_edit_module.cpp:325 -msgid "Move and Auto Place" -msgstr "Move et Placement Automatique" - -#: pcbnew/dialog_edit_module.cpp:330 -msgid "Enable hotkey move commands and Auto Placement" -msgstr "Autoriser les commandes clavier de déplacement et l'auto placement" - -#: pcbnew/dialog_edit_module.cpp:331 -msgid "Disable hotkey move commands and Auto Placement" -msgstr "Interdire les commandes clavier de déplacement et l'auto placement" - -#: pcbnew/dialog_edit_module.cpp:335 -msgid "Rot 90" -msgstr "Rot 90" - -#: pcbnew/dialog_edit_module.cpp:343 -msgid "Rot 180" -msgstr "Rot 180" - -#: pcbnew/dialog_edit_module.cpp:380 -msgid "3D Shape Name" -msgstr "3D forme" - -#: pcbnew/dialog_edit_module.cpp:401 -msgid "Add 3D Shape" -msgstr "Ajout Forme 3D" - -#: pcbnew/dialog_edit_module.cpp:407 -msgid "Remove 3D Shape" -msgstr "Suppr. Forme 3D:" - -#: pcbnew/dialog_edit_module.cpp:413 -msgid "Shape Scale:" -msgstr "Echelle de la forme:" - -#: pcbnew/dialog_edit_module.cpp:420 -msgid "Shape Offset:" -msgstr "Offset forme:" - -#: pcbnew/dialog_edit_module.cpp:429 -msgid "Shape Rotation:" -msgstr "Rot de la forme" - -#: pcbnew/dialog_edit_module.cpp:469 -msgid "3D Shape:" -msgstr "Forme 3D:" - -#: pcbnew/dialog_edit_module.cpp:774 -msgid "Reference or Value cannot be deleted" -msgstr "Référence ou Valeur ne peut etre effacée" - -#: pcbnew/dialog_edit_module.cpp:778 -#, c-format -msgid "Delete [%s]" -msgstr "Supprimer [%s]" - #: pcbnew/class_text_mod.cpp:323 msgid "Ref." msgstr "Ref." @@ -4232,344 +4154,344 @@ msgstr "Via %.1f" msgid "Via %.3f" msgstr "Via %.3f" -#: pcbnew/onrightclick.cpp:189 +#: pcbnew/onrightclick.cpp:188 msgid "Lock Module" msgstr "Verrouiller Modules" -#: pcbnew/onrightclick.cpp:195 +#: pcbnew/onrightclick.cpp:194 msgid "Unlock Module" msgstr "Déverrouiller Modules" -#: pcbnew/onrightclick.cpp:202 +#: pcbnew/onrightclick.cpp:201 msgid "Auto place Module" msgstr "Auto place Module" -#: pcbnew/onrightclick.cpp:208 +#: pcbnew/onrightclick.cpp:207 msgid "Autoroute" msgstr "Autoroute" -#: pcbnew/onrightclick.cpp:224 +#: pcbnew/onrightclick.cpp:223 msgid "Move Drawing" msgstr "Déplace Tracé" -#: pcbnew/onrightclick.cpp:229 +#: pcbnew/onrightclick.cpp:228 msgid "End Drawing" msgstr "Fin tracé" -#: pcbnew/onrightclick.cpp:231 +#: pcbnew/onrightclick.cpp:230 msgid "Edit Drawing" msgstr "Edit Tracé" -#: pcbnew/onrightclick.cpp:232 +#: pcbnew/onrightclick.cpp:231 msgid "Delete Drawing" msgstr "Supprimer Tracé" -#: pcbnew/onrightclick.cpp:239 +#: pcbnew/onrightclick.cpp:238 msgid "End edge zone" msgstr "Fin contour Zone" -#: pcbnew/onrightclick.cpp:242 +#: pcbnew/onrightclick.cpp:241 msgid "Delete edge zone" msgstr "Supprimer Contour Zone" -#: pcbnew/onrightclick.cpp:257 +#: pcbnew/onrightclick.cpp:256 msgid "Edit Zone" msgstr "Editer Zone" -#: pcbnew/onrightclick.cpp:259 +#: pcbnew/onrightclick.cpp:258 msgid "Delete Zone" msgstr "Supprimer Zone" -#: pcbnew/onrightclick.cpp:264 +#: pcbnew/onrightclick.cpp:263 msgid "Delete Marker" msgstr "Effacer Marqueur" -#: pcbnew/onrightclick.cpp:271 +#: pcbnew/onrightclick.cpp:270 msgid "Edit Cotation" msgstr "Editer Cotation" -#: pcbnew/onrightclick.cpp:274 +#: pcbnew/onrightclick.cpp:273 msgid "Delete Cotation" msgstr "Supprimer Cotation" -#: pcbnew/onrightclick.cpp:281 +#: pcbnew/onrightclick.cpp:280 msgid "Move Mire" msgstr "Déplace Mire" -#: pcbnew/onrightclick.cpp:284 +#: pcbnew/onrightclick.cpp:283 msgid "Edit Mire" msgstr "Edit Mire" -#: pcbnew/onrightclick.cpp:286 +#: pcbnew/onrightclick.cpp:285 msgid "Delete Mire" msgstr "Supprimer Mire" -#: pcbnew/onrightclick.cpp:313 +#: pcbnew/onrightclick.cpp:312 msgid "Get and Move Footprint" msgstr "Sel et Dépl.t module" -#: pcbnew/onrightclick.cpp:325 +#: pcbnew/onrightclick.cpp:324 msgid "Fill zone" msgstr "Remplir zone" -#: pcbnew/onrightclick.cpp:333 +#: pcbnew/onrightclick.cpp:332 msgid "Select Net" msgstr "Sélection Net" -#: pcbnew/onrightclick.cpp:338 +#: pcbnew/onrightclick.cpp:337 msgid "Delete Zone Limit" msgstr "Supprimer Limite de Zone" -#: pcbnew/onrightclick.cpp:343 -#: pcbnew/onrightclick.cpp:354 -#: pcbnew/onrightclick.cpp:367 -#: pcbnew/onrightclick.cpp:428 +#: pcbnew/onrightclick.cpp:342 +#: pcbnew/onrightclick.cpp:353 +#: pcbnew/onrightclick.cpp:366 +#: pcbnew/onrightclick.cpp:427 msgid "Select Working Layer" msgstr "Sélection de la couche de travail" -#: pcbnew/onrightclick.cpp:352 -#: pcbnew/onrightclick.cpp:425 +#: pcbnew/onrightclick.cpp:351 +#: pcbnew/onrightclick.cpp:424 msgid "Select Track Width" msgstr "Sélection Epais. Piste" -#: pcbnew/onrightclick.cpp:356 +#: pcbnew/onrightclick.cpp:355 msgid "Select layer pair for vias" msgstr "Selection couple de couches pour Vias" -#: pcbnew/onrightclick.cpp:373 +#: pcbnew/onrightclick.cpp:372 msgid "Footprint documentation" msgstr "Documentation des modules" -#: pcbnew/onrightclick.cpp:383 +#: pcbnew/onrightclick.cpp:382 msgid "Glob Move and Place" msgstr "Move et Place Globaux" -#: pcbnew/onrightclick.cpp:385 +#: pcbnew/onrightclick.cpp:384 msgid "Unlock All Modules" msgstr "Déverrouiller tous les Modules" -#: pcbnew/onrightclick.cpp:387 +#: pcbnew/onrightclick.cpp:386 msgid "Lock All Modules" msgstr "Verrouiller tous les Modules" -#: pcbnew/onrightclick.cpp:390 +#: pcbnew/onrightclick.cpp:389 msgid "Move All Modules" msgstr "Déplace tous les Modules" -#: pcbnew/onrightclick.cpp:391 +#: pcbnew/onrightclick.cpp:390 msgid "Move New Modules" msgstr "Déplace nouveaux Modules" -#: pcbnew/onrightclick.cpp:393 +#: pcbnew/onrightclick.cpp:392 msgid "Autoplace All Modules" msgstr "Autoplace Tous Modules" -#: pcbnew/onrightclick.cpp:394 +#: pcbnew/onrightclick.cpp:393 msgid "Autoplace New Modules" msgstr "AutoPlace nouveaux Modules" -#: pcbnew/onrightclick.cpp:395 +#: pcbnew/onrightclick.cpp:394 msgid "Autoplace Next Module" msgstr "Autoplace Module suivant" -#: pcbnew/onrightclick.cpp:398 +#: pcbnew/onrightclick.cpp:397 msgid "Orient All Modules" msgstr "Oriente Tous Modules" -#: pcbnew/onrightclick.cpp:405 +#: pcbnew/onrightclick.cpp:404 msgid "Global Autoroute" msgstr "Autoroutage global" -#: pcbnew/onrightclick.cpp:407 +#: pcbnew/onrightclick.cpp:406 msgid "Select layer pair" msgstr "Selection couple de couches" -#: pcbnew/onrightclick.cpp:409 +#: pcbnew/onrightclick.cpp:408 msgid "Autoroute All Modules" msgstr "Autoroute Tous Modules" -#: pcbnew/onrightclick.cpp:411 +#: pcbnew/onrightclick.cpp:410 msgid "Reset Unrouted" msgstr "Réinit Non routés" -#: pcbnew/onrightclick.cpp:416 +#: pcbnew/onrightclick.cpp:415 msgid "Global AutoRouter" msgstr "Autorouteur Global" -#: pcbnew/onrightclick.cpp:418 +#: pcbnew/onrightclick.cpp:417 msgid "Read Global AutoRouter Data" msgstr "Lire Données de L'autorouteur global" -#: pcbnew/onrightclick.cpp:454 +#: pcbnew/onrightclick.cpp:453 msgid "Flip Block (alt + drag mouse)" msgstr "Inversion Bloc (alt + drag mouse)" -#: pcbnew/onrightclick.cpp:477 +#: pcbnew/onrightclick.cpp:476 msgid "Drag Via" msgstr "Drag Via" -#: pcbnew/onrightclick.cpp:481 +#: pcbnew/onrightclick.cpp:480 msgid "Edit Via" msgstr "Edit Via" -#: pcbnew/onrightclick.cpp:483 +#: pcbnew/onrightclick.cpp:482 msgid "Set via hole to Default" msgstr "Ajuste perçage via à défaut" -#: pcbnew/onrightclick.cpp:485 +#: pcbnew/onrightclick.cpp:484 msgid "Set via hole to alt value" msgstr "Ajuste perçage via à valeur alternative" -#: pcbnew/onrightclick.cpp:487 +#: pcbnew/onrightclick.cpp:486 msgid "Set the via hole alt value" msgstr "Ajuste la valeur alt. perçage via" -#: pcbnew/onrightclick.cpp:489 +#: pcbnew/onrightclick.cpp:488 msgid "Export Via hole to alt value" msgstr "Exporte perçage via à valeur alt." -#: pcbnew/onrightclick.cpp:491 +#: pcbnew/onrightclick.cpp:490 msgid "Export via hole to others id vias" msgstr "Exporte perçage via aux autres semblables." -#: pcbnew/onrightclick.cpp:493 +#: pcbnew/onrightclick.cpp:492 msgid "Set ALL via holes to default" msgstr "Ajuste perçage TOUTES vias au défaut" -#: pcbnew/onrightclick.cpp:506 +#: pcbnew/onrightclick.cpp:505 msgid "Move Node" msgstr "Déplace Noeud" -#: pcbnew/onrightclick.cpp:511 +#: pcbnew/onrightclick.cpp:510 msgid "Drag Segments, keep slope" msgstr "Drag Segments, garder direction" -#: pcbnew/onrightclick.cpp:513 +#: pcbnew/onrightclick.cpp:512 msgid "Drag Segment" msgstr "Drag Segment" -#: pcbnew/onrightclick.cpp:516 +#: pcbnew/onrightclick.cpp:515 msgid "Move Segment" msgstr "Déplace Segment" -#: pcbnew/onrightclick.cpp:519 +#: pcbnew/onrightclick.cpp:518 msgid "Break Track" msgstr "Briser piste" -#: pcbnew/onrightclick.cpp:526 +#: pcbnew/onrightclick.cpp:525 msgid "Place Node" msgstr "Place noeud" -#: pcbnew/onrightclick.cpp:533 +#: pcbnew/onrightclick.cpp:532 msgid "End Track" msgstr "Terminer Piste" -#: pcbnew/onrightclick.cpp:536 +#: pcbnew/onrightclick.cpp:535 msgid "Place Via" msgstr "Place Via" -#: pcbnew/onrightclick.cpp:543 +#: pcbnew/onrightclick.cpp:542 msgid "Change Width" msgstr "Change Largeur" -#: pcbnew/onrightclick.cpp:545 +#: pcbnew/onrightclick.cpp:544 msgid "Edit Segment" msgstr "Edit Segment" -#: pcbnew/onrightclick.cpp:549 +#: pcbnew/onrightclick.cpp:548 msgid "Edit Track" msgstr "Editer Piste" -#: pcbnew/onrightclick.cpp:551 +#: pcbnew/onrightclick.cpp:550 msgid "Edit Net" msgstr "Edit Net" -#: pcbnew/onrightclick.cpp:553 +#: pcbnew/onrightclick.cpp:552 msgid "Edit ALL Tracks and Vias" msgstr "Editer TOUTES Pistes et Vias" -#: pcbnew/onrightclick.cpp:555 +#: pcbnew/onrightclick.cpp:554 msgid "Edit ALL Vias (no track)" msgstr "Editer TOUTES Vias (pas les pistes)" -#: pcbnew/onrightclick.cpp:557 +#: pcbnew/onrightclick.cpp:556 msgid "Edit ALL Tracks (no via)" msgstr "Editer TOUTES Pistes (pas les vias)" -#: pcbnew/onrightclick.cpp:564 +#: pcbnew/onrightclick.cpp:563 msgid "Delete Segment" msgstr "SupprimerSegment" -#: pcbnew/onrightclick.cpp:569 +#: pcbnew/onrightclick.cpp:568 msgid "Delete Track" msgstr "Effacer Piste" -#: pcbnew/onrightclick.cpp:573 +#: pcbnew/onrightclick.cpp:572 msgid "Delete Net" msgstr "Supprimer Net" -#: pcbnew/onrightclick.cpp:578 +#: pcbnew/onrightclick.cpp:577 msgid "Set Flags" msgstr "Ajust. Flags" -#: pcbnew/onrightclick.cpp:579 +#: pcbnew/onrightclick.cpp:578 msgid "Locked: Yes" msgstr "Verrou: Oui" -#: pcbnew/onrightclick.cpp:580 +#: pcbnew/onrightclick.cpp:579 msgid "Locked: No" msgstr "Verrou: Non" -#: pcbnew/onrightclick.cpp:590 +#: pcbnew/onrightclick.cpp:589 msgid "Track Locked: Yes" msgstr "Piste verrouillée: Oui" -#: pcbnew/onrightclick.cpp:591 +#: pcbnew/onrightclick.cpp:590 msgid "Track Locked: No" msgstr "Piste verrouillée: Non" -#: pcbnew/onrightclick.cpp:593 +#: pcbnew/onrightclick.cpp:592 msgid "Net Locked: Yes" msgstr "Net verrouillé: Oui" -#: pcbnew/onrightclick.cpp:594 +#: pcbnew/onrightclick.cpp:593 msgid "Net Locked: No" msgstr "Net verrouillé: Non" -#: pcbnew/onrightclick.cpp:616 -#: pcbnew/onrightclick.cpp:661 -#: pcbnew/onrightclick.cpp:699 -#: pcbnew/onrightclick.cpp:758 +#: pcbnew/onrightclick.cpp:615 +#: pcbnew/onrightclick.cpp:660 +#: pcbnew/onrightclick.cpp:698 +#: pcbnew/onrightclick.cpp:757 msgid "Move" msgstr "Move" -#: pcbnew/onrightclick.cpp:619 -#: pcbnew/onrightclick.cpp:701 +#: pcbnew/onrightclick.cpp:618 +#: pcbnew/onrightclick.cpp:700 msgid "Drag" msgstr "Drag" -#: pcbnew/onrightclick.cpp:623 +#: pcbnew/onrightclick.cpp:622 msgid "Rotate +" msgstr "Rotation +" -#: pcbnew/onrightclick.cpp:627 -#: eeschema/onrightclick.cpp:297 +#: pcbnew/onrightclick.cpp:626 +#: eeschema/onrightclick.cpp:299 msgid "Rotate -" msgstr "Rotation -" -#: pcbnew/onrightclick.cpp:628 +#: pcbnew/onrightclick.cpp:627 msgid "Flip" msgstr "Change côté" -#: pcbnew/onrightclick.cpp:718 +#: pcbnew/onrightclick.cpp:717 msgid "delete" msgstr "Effacer" -#: pcbnew/onrightclick.cpp:725 +#: pcbnew/onrightclick.cpp:724 msgid "Autoroute Pad" msgstr "Autoroute Pad" -#: pcbnew/onrightclick.cpp:726 +#: pcbnew/onrightclick.cpp:725 msgid "Autoroute Net" msgstr "Autoroute Net" @@ -4672,45 +4594,31 @@ msgstr "Grille %.1f" msgid "Grid %.3f" msgstr "Grille %.3f" -#: pcbnew/win_eda_cleaningoptionsframe.cpp:138 -#: pcbnew/win_eda_cleaningoptionsframe.cpp:162 -#: pcbnew/cleaningoptions_dialog.cpp:146 -msgid "Static" -msgstr "Static" +#: pcbnew/class_board.cpp:317 +msgid "Nodes" +msgstr "Nodes" -#: pcbnew/win_eda_cleaningoptionsframe.cpp:142 -#: pcbnew/cleaningoptions_dialog.cpp:150 -msgid "Delete redundant vias" -msgstr "Supprimer vias redondantes" +#: pcbnew/class_board.cpp:320 +msgid "Links" +msgstr "Liens" -#: pcbnew/win_eda_cleaningoptionsframe.cpp:146 -#: pcbnew/cleaningoptions_dialog.cpp:154 -msgid "Merge segments" -msgstr "Compacter Segments" +#: pcbnew/class_board.cpp:323 +msgid "Nets" +msgstr "Nets" -#: pcbnew/win_eda_cleaningoptionsframe.cpp:150 -msgid "Delete 0 lenght segments" -msgstr "Supprimer Segment longueur 0" +#: pcbnew/class_board.cpp:326 +msgid "Connect" +msgstr "Connect" -#: pcbnew/win_eda_cleaningoptionsframe.cpp:154 -#: pcbnew/cleaningoptions_dialog.cpp:158 -msgid "Delete unconnected tracks" -msgstr "Suppression Pistes non connectées" +#: pcbnew/class_board.cpp:329 +#: eeschema/eelayer.cpp:177 +msgid "NoConn" +msgstr "Non Conn" -#: pcbnew/win_eda_cleaningoptionsframe.cpp:158 -#: pcbnew/cleaningoptions_dialog.cpp:162 -msgid "Connect to Pads" -msgstr "Connection aux pads" - -#: pcbnew/win_eda_cleaningoptionsframe.cpp:166 -#: pcbnew/cleaningoptions_dialog.cpp:171 -msgid "Clean pcb" -msgstr "Nettoyage PCB" - -#: pcbnew/win_eda_cleaningoptionsframe.cpp:172 -#: common/confirm.cpp:97 -msgid "Infos:" -msgstr "Infos:" +#: pcbnew/move-drag_pads.cpp:251 +#, c-format +msgid "Delete Pad (module %s %s) " +msgstr "Effacer Pad (module %s %s) " #: pcbnew/class_module.cpp:1106 msgid "Last Change" @@ -4728,26 +4636,108 @@ msgstr "Doc: " msgid "KeyW: " msgstr "KeyW: " -#: pcbnew/class_board.cpp:291 -msgid "Nodes" -msgstr "Nodes" +#: pcbnew/dialog_drc.cpp:141 +#: eeschema/editpart.cpp:208 +#: eeschema/dialog_erc.cpp:237 +#: eeschema/dialog_edit_component_in_lib.cpp:166 +#: eeschema/dialog_create_component.cpp:176 +#: eeschema/dialog_edit_component_in_schematic.cpp:204 +#: eeschema/libedpart.cpp:247 +#: eeschema/dialog_build_BOM.cpp:279 +#: cvpcb/dialog_display_options.h:43 +msgid "Options" +msgstr "Options" -#: pcbnew/class_board.cpp:294 -msgid "Links" -msgstr "Liens" +#: pcbnew/dialog_drc.cpp:153 +msgid "Test Drc:" +msgstr "Test Drc:" -#: pcbnew/class_board.cpp:297 -msgid "Nets" -msgstr "Nets" +#: pcbnew/dialog_drc.cpp:157 +msgid "Include pad to pad test" +msgstr "Inclure test pad à pad" -#: pcbnew/class_board.cpp:300 -msgid "Connect" -msgstr "Connect" +#: pcbnew/dialog_drc.cpp:161 +msgid "Include unconnected" +msgstr "Inclure non connexions" -#: pcbnew/class_board.cpp:303 -#: eeschema/eelayer.cpp:177 -msgid "NoConn" -msgstr "Non Conn" +#: pcbnew/dialog_drc.cpp:169 +msgid "Create Report file" +msgstr "Créer fichier rapport " + +#: pcbnew/dialog_drc.cpp:182 +msgid "Test Drc" +msgstr "Test Drc" + +#: pcbnew/dialog_drc.cpp:186 +msgid "Stop Drc" +msgstr "Stop Drc" + +#: pcbnew/dialog_drc.cpp:193 +msgid "Del Markers" +msgstr "Supprimer Marqueurs" + +#: pcbnew/dialog_drc.cpp:197 +msgid "List Unconn" +msgstr "Liste Non Conn." + +#: pcbnew/dialog_drc.cpp:204 +msgid "Report File" +msgstr "Fichier rapport" + +#: pcbnew/dialog_drc.cpp:215 +#: common/svg_print.cpp:232 +#: share/svg_print.cpp:232 +msgid "Messages:" +msgstr "Messages:" + +#: pcbnew/dialog_drc.cpp:350 +msgid "DRC Report file" +msgstr "Fichier rapport de contrôle DRC:" + +#: pcbnew/editrack-part2.cpp:32 +#, c-format +msgid "Track Width: %s Vias Size : %s" +msgstr "Larg. piste: %s Diam Vias : %s" + +#: pcbnew/editrack-part2.cpp:135 +msgid "Drc error, cancelled" +msgstr "Erreur DRC, annulation" + +#: pcbnew/onleftclick.cpp:173 +msgid "Graphic not autorized on Copper layers" +msgstr "Graphique non autorisé sur couches cuivre" + +#: pcbnew/onleftclick.cpp:196 +msgid "Tracks on Copper layers only " +msgstr "Pistes sur couches cuivre seulement" + +#: pcbnew/onleftclick.cpp:272 +msgid "Cotation not autorized on Copper layers" +msgstr "Cotation non autorisée sur couches cuivre" + +#: pcbnew/cleaningoptions_dialog.cpp:146 +msgid "Static" +msgstr "Static" + +#: pcbnew/cleaningoptions_dialog.cpp:150 +msgid "Delete redundant vias" +msgstr "Supprimer vias redondantes" + +#: pcbnew/cleaningoptions_dialog.cpp:154 +msgid "Merge segments" +msgstr "Compacter Segments" + +#: pcbnew/cleaningoptions_dialog.cpp:158 +msgid "Delete unconnected tracks" +msgstr "Suppression Pistes non connectées" + +#: pcbnew/cleaningoptions_dialog.cpp:162 +msgid "Connect to Pads" +msgstr "Connection aux pads" + +#: pcbnew/cleaningoptions_dialog.cpp:171 +msgid "Clean pcb" +msgstr "Nettoyage PCB" #: pcbnew/dialog_general_options.cpp:263 #: gerbview/options.cpp:173 @@ -4761,7 +4751,6 @@ msgstr "Affichage coord Polaires" #: pcbnew/dialog_general_options.cpp:273 #: eeschema/options.cpp:187 -#: eeschema/optionsframe.cpp:135 #: eeschema/dialog_options.cpp:248 #: gerbview/options.cpp:185 msgid "Units" @@ -5280,7 +5269,6 @@ msgid "EESchema Preferences" msgstr "EESchema Préférences" #: eeschema/options.cpp:119 -#: eeschema/optionsframe.cpp:106 #: eeschema/dialog_options.cpp:212 msgid "Show grid" msgstr "Afficher grille" @@ -5316,7 +5304,6 @@ msgid "Special (1 mil)" msgstr "Special (1 mil)" #: eeschema/options.cpp:138 -#: eeschema/optionsframe.cpp:116 #: eeschema/dialog_options.cpp:224 msgid "Grid Size" msgstr "Dim Grille" @@ -5327,7 +5314,6 @@ msgid "Show alls" msgstr "Tout Afficher" #: eeschema/options.cpp:179 -#: eeschema/optionsframe.cpp:124 #: eeschema/dialog_options.cpp:232 msgid "Show pins" msgstr "Monter Pins" @@ -5357,43 +5343,6 @@ msgstr "Incr msgid "Failed to create file " msgstr "Impossible de créer le fichier " -#: eeschema/optionsframe.cpp:112 -msgid "&Normal (50 mils)" -msgstr "&Normal (50 mils)" - -#: eeschema/optionsframe.cpp:113 -msgid "&Small (20 mils)" -msgstr "&Petit (25 mils)" - -#: eeschema/optionsframe.cpp:114 -msgid "&Very small (10 mils)" -msgstr "&Très petit (10 mils)" - -#: eeschema/optionsframe.cpp:121 -msgid "&Normal" -msgstr "&Normal" - -#: eeschema/optionsframe.cpp:122 -#: eeschema/optionsframe.cpp:133 -msgid "&inches" -msgstr "&Pouces" - -#: eeschema/optionsframe.cpp:132 -msgid "&millimeters" -msgstr "&millimetres" - -#: eeschema/optionsframe.cpp:142 -msgid "&Horiz/Vertical" -msgstr "&Horiz/Vertical" - -#: eeschema/optionsframe.cpp:143 -msgid "&Any" -msgstr "&Tout" - -#: eeschema/optionsframe.cpp:145 -msgid "Wire - Bus orient" -msgstr "Fils-Bus Orient" - #: eeschema/dialog_options.cpp:140 #: eeschema/dialog_options.cpp:288 msgid "Delta Step X" @@ -5596,7 +5545,7 @@ msgid "&Edit" msgstr "&Editer" #: eeschema/editpart.cpp:140 -#: eeschema/dialog_edit_component_in_schematic.h:53 +#: eeschema/dialog_edit_component_in_schematic.h:52 msgid "Component properties" msgstr "Propriétés du composant" @@ -5628,7 +5577,7 @@ msgstr "Pos" #: eeschema/editpart.cpp:294 #: eeschema/affiche.cpp:172 -#: eeschema/onrightclick.cpp:330 +#: eeschema/onrightclick.cpp:332 msgid "Unit" msgstr "Unité" @@ -5644,7 +5593,7 @@ msgstr "Orient:" #: eeschema/editpart.cpp:324 #: eeschema/dialog_edit_component_in_schematic.cpp:183 -#: eeschema/onrightclick.cpp:298 +#: eeschema/onrightclick.cpp:300 msgid "Mirror --" msgstr "Miroir--" @@ -5660,7 +5609,7 @@ msgstr "Miroir:" #: eeschema/editpart.cpp:337 #: eeschema/affiche.cpp:182 #: eeschema/dialog_edit_component_in_schematic.cpp:193 -#: eeschema/onrightclick.cpp:317 +#: eeschema/onrightclick.cpp:319 msgid "Convert" msgstr "Convert" @@ -5764,7 +5713,7 @@ msgid "Reset" msgstr "Défaut" #: eeschema/genliste.cpp:101 -#: eeschema/dialog_build_BOM.h:59 +#: eeschema/dialog_build_BOM.h:58 msgid "List of Material" msgstr "Liste du Matériel" @@ -5891,45 +5840,62 @@ msgstr "> %-28.28s Sheet %-7.7s (feuille %.2d) pos: %3.3f, %3.3f\n" msgid "#End labels\n" msgstr "#End labels\n" -#: eeschema/find.cpp:165 +#: eeschema/find.cpp:220 +msgid "Pin " +msgstr "Pin " + +#: eeschema/find.cpp:224 +msgid "Ref " +msgstr "Ref " + +#: eeschema/find.cpp:232 +msgid "Field " +msgstr "Champ " + +#: eeschema/find.cpp:242 +#: eeschema/find.cpp:246 +msgid " Found" +msgstr " Trouvé " + +#: eeschema/find.cpp:377 #, c-format msgid "Marker %d found in %s" msgstr "Marqueur %d trouvé en %s " -#: eeschema/find.cpp:171 +#: eeschema/find.cpp:383 msgid "Marker Not Found" msgstr "Marqueur non trouvé" -#: eeschema/find.cpp:396 +#: eeschema/find.cpp:612 msgid " Found in " msgstr " Trouvé en " -#: eeschema/find.cpp:408 +#: eeschema/find.cpp:624 msgid " Not Found" msgstr " Non trouvé" -#: eeschema/find.cpp:440 +#: eeschema/find.cpp:656 #: eeschema/selpart.cpp:39 msgid "No libraries are loaded" msgstr "Pas de librairies chargées" -#: eeschema/find.cpp:467 -#: eeschema/find.cpp:532 -#: eeschema/find.cpp:548 +#: eeschema/find.cpp:683 +#: eeschema/find.cpp:748 +#: eeschema/find.cpp:764 msgid "Found " msgstr "Trouvé " -#: eeschema/find.cpp:469 -#: eeschema/find.cpp:533 -#: eeschema/find.cpp:549 +#: eeschema/find.cpp:685 +#: eeschema/find.cpp:749 +#: eeschema/find.cpp:765 msgid " in lib " msgstr " en libr. " -#: eeschema/find.cpp:480 +#: eeschema/find.cpp:696 msgid " found only in cache" msgstr "trouvé seulement en cache" -#: eeschema/find.cpp:483 +#: eeschema/find.cpp:699 msgid "" "\n" "Explore All Libraries?" @@ -5937,7 +5903,7 @@ msgstr "" "\n" "Explorer toutes les Librairies?" -#: eeschema/find.cpp:489 +#: eeschema/find.cpp:705 msgid "Nothing found" msgstr " Rien trouvé" @@ -6031,6 +5997,76 @@ msgstr "Messages :" msgid "Plot: %s\n" msgstr "Trace: %s\n" +#: eeschema/netlist_control.cpp:98 +#: eeschema/netlist_control.cpp:251 +#: gerbview/options.cpp:199 +msgid "Default format" +msgstr "Format par défaut" + +#: eeschema/netlist_control.cpp:112 +msgid "&Browse Plugin" +msgstr "&Examen Plugins" + +#: eeschema/netlist_control.cpp:117 +msgid "&Netlist" +msgstr "&Netliste" + +#: eeschema/netlist_control.cpp:181 +#: eeschema/netlist_control.cpp:266 +msgid "Netlist" +msgstr "Netliste" + +#: eeschema/netlist_control.cpp:255 +msgid "Use Net Names" +msgstr "Utiliser nom de net" + +#: eeschema/netlist_control.cpp:255 +msgid "Use Net Numbers" +msgstr "Utiliser numéro de net" + +#: eeschema/netlist_control.cpp:256 +msgid "Netlist Options:" +msgstr "Options de netliste:" + +#: eeschema/netlist_control.cpp:263 +msgid "Simulator command:" +msgstr "Simulateur commande:" + +#: eeschema/netlist_control.cpp:270 +msgid "&Run Simulator" +msgstr "&Simulateur" + +#: eeschema/netlist_control.cpp:302 +msgid "Add Plugin" +msgstr "Ajouter Plugin" + +#: eeschema/netlist_control.cpp:314 +msgid "Netlist command:" +msgstr "Commande netliste:" + +#: eeschema/netlist_control.cpp:318 +#: share/setpage.cpp:262 +msgid "Title:" +msgstr "Titre:" + +#: eeschema/netlist_control.cpp:333 +msgid "Plugin files:" +msgstr "Fichiers Plugins:" + +#: eeschema/netlist_control.cpp:353 +msgid "" +"Now, you must choose a title for this netlist control page\n" +"and close the dialog box" +msgstr "Maitenant, vous devez choisir un titre pour cette page de controle de netliste" + +#: eeschema/netlist_control.cpp:432 +msgid "Netlist files:" +msgstr "Fichiers Netlist:" + +#: eeschema/netlist_control.cpp:448 +msgid "Must be Annotated, Continue ?" +msgstr "Annotation nécessaire, continuer?" + #: eeschema/tool_lib.cpp:48 msgid "deselect current tool" msgstr "Désélection outil courant" @@ -6176,26 +6212,26 @@ msgid "Display next part" msgstr "Afficher composant suivant" #: eeschema/tool_viewlib.cpp:70 -#: cvpcb/displayframe.cpp:118 +#: cvpcb/displayframe.cpp:119 #: 3d-viewer/3d_toolbar.cpp:44 msgid "zoom + (F1)" msgstr "zoom + (F1)" #: eeschema/tool_viewlib.cpp:74 -#: cvpcb/displayframe.cpp:121 +#: cvpcb/displayframe.cpp:122 #: 3d-viewer/3d_toolbar.cpp:47 msgid "zoom - (F2)" msgstr "zoom - (F2)" #: eeschema/tool_viewlib.cpp:78 -#: cvpcb/displayframe.cpp:124 +#: cvpcb/displayframe.cpp:125 #: 3d-viewer/3d_toolbar.cpp:50 msgid "redraw (F3)" msgstr "Redessin (F3)" #: eeschema/tool_viewlib.cpp:82 -#: cvpcb/displayframe.cpp:127 -#: cvpcb/displayframe.cpp:131 +#: cvpcb/displayframe.cpp:128 +#: cvpcb/displayframe.cpp:132 msgid "1:1 zoom" msgstr "1:1 zoom" @@ -6215,48 +6251,32 @@ msgstr "Voir documents des composants" msgid "Export to schematic" msgstr "Exportervers schematique" -#: eeschema/files-io.cpp:55 -msgid "Clear SubHierarchy ?" -msgstr "Supprimer la sous hiérarchie?" - -#: eeschema/files-io.cpp:62 -#: eeschema/save_schemas.cpp:71 -#: eeschema/eeload.cpp:59 -msgid "Schematic files:" -msgstr "Fichiers schématiques:" - #: eeschema/eestatus.cpp:150 -#: eeschema/dialog_set_status.cpp:148 #: eeschema/dialog_eeschema_config.cpp:232 msgid "Cmp file Ext: " msgstr "Ext fichier Cmp: " #: eeschema/eestatus.cpp:154 -#: eeschema/dialog_set_status.cpp:151 #: eeschema/dialog_eeschema_config.cpp:236 msgid "Net file Ext: " msgstr "Ext fichier Netliste: " #: eeschema/eestatus.cpp:158 -#: eeschema/dialog_set_status.cpp:154 #: eeschema/dialog_eeschema_config.cpp:240 msgid "Library file Ext: " msgstr "Ext fichier Librairie: " #: eeschema/eestatus.cpp:162 -#: eeschema/dialog_set_status.cpp:157 #: eeschema/dialog_eeschema_config.cpp:244 msgid "Symbol file Ext: " msgstr "Ext fichier Symbole: " #: eeschema/eestatus.cpp:166 -#: eeschema/dialog_set_status.cpp:160 #: eeschema/dialog_eeschema_config.cpp:248 msgid "Schematic file Ext: " msgstr "Ext fichier Schema: " #: eeschema/eestatus.cpp:174 -#: eeschema/dialog_set_status.cpp:190 #: eeschema/dialog_eeschema_config.cpp:219 msgid "Library files path:" msgstr "Chemin Fichiers Librairies:" @@ -6272,7 +6292,6 @@ msgid "Library already in use" msgstr "Librairie déjà en usage" #: eeschema/eestatus.cpp:303 -#: eeschema/dialog_set_status.cpp:141 #: eeschema/dialog_eeschema_config.cpp:174 #: cvpcb/dialog_cvpcb_config.cpp:144 msgid "NetList Formats:" @@ -6354,6 +6373,12 @@ msgstr "Forme GLabel:" msgid "Size " msgstr "Taille " +#: eeschema/save_schemas.cpp:71 +#: eeschema/eeload.cpp:59 +#: eeschema/files-io.cpp:65 +msgid "Schematic files:" +msgstr "Fichiers schématiques:" + #: eeschema/save_schemas.cpp:99 msgid "Save file " msgstr "Sauver fichier " @@ -6363,35 +6388,6 @@ msgstr "Sauver fichier " msgid "File write operation failed." msgstr "Erreur sur écriture sur fichier." -#: eeschema/dialog_set_status.cpp:135 -#: cvpcb/dialog_cvpcb_config.cpp:140 -msgid "&PcbNew" -msgstr "&PcbNew" - -#: eeschema/dialog_set_status.cpp:136 -#: eeschema/dialog_eeschema_config.cpp:169 -msgid "&OrcadPcb2" -msgstr "&OrcadPcb2" - -#: eeschema/dialog_set_status.cpp:137 -#: eeschema/dialog_eeschema_config.cpp:170 -msgid "&CadStar" -msgstr "&CadStar" - -#: eeschema/dialog_set_status.cpp:138 -#: eeschema/dialog_eeschema_config.cpp:171 -msgid "&Spice" -msgstr "&Spice" - -#: eeschema/dialog_set_status.cpp:139 -#: eeschema/dialog_eeschema_config.cpp:172 -msgid "Other" -msgstr "Autre" - -#: eeschema/dialog_set_status.cpp:182 -msgid "Libraries:" -msgstr "Librairies:" - #: eeschema/viewlibs.cpp:117 msgid "Browse library: " msgstr "Examen librairie: " @@ -6820,80 +6816,26 @@ msgstr "Vous devez fournir un nom pour ce composant" msgid "PcbNew" msgstr "PcbNew" +#: eeschema/dialog_eeschema_config.cpp:169 +msgid "&OrcadPcb2" +msgstr "&OrcadPcb2" + +#: eeschema/dialog_eeschema_config.cpp:170 +msgid "&CadStar" +msgstr "&CadStar" + +#: eeschema/dialog_eeschema_config.cpp:171 +msgid "&Spice" +msgstr "&Spice" + +#: eeschema/dialog_eeschema_config.cpp:172 +msgid "Other" +msgstr "Autre" + #: eeschema/dialog_eeschema_config.cpp:473 msgid " Default Path for libraries" msgstr "Chemin par défaut des librairies" -#: eeschema/netlist_control.cpp:98 -#: eeschema/netlist_control.cpp:252 -#: gerbview/options.cpp:199 -msgid "Default format" -msgstr "Format par défaut" - -#: eeschema/netlist_control.cpp:112 -msgid "&Browse Plugin" -msgstr "&Examen Plugins" - -#: eeschema/netlist_control.cpp:117 -msgid "&Netlist" -msgstr "&Netliste" - -#: eeschema/netlist_control.cpp:181 -#: eeschema/netlist_control.cpp:267 -msgid "Netlist" -msgstr "Netliste" - -#: eeschema/netlist_control.cpp:256 -msgid "Use Net Names" -msgstr "Utiliser nom de net" - -#: eeschema/netlist_control.cpp:256 -msgid "Use Net Numbers" -msgstr "Utiliser numéro de net" - -#: eeschema/netlist_control.cpp:257 -msgid "Netlist Options:" -msgstr "Options de netliste:" - -#: eeschema/netlist_control.cpp:264 -msgid "Simulator command:" -msgstr "Simulateur commande:" - -#: eeschema/netlist_control.cpp:271 -msgid "&Run Simulator" -msgstr "&Simulateur" - -#: eeschema/netlist_control.cpp:303 -msgid "Add Plugin" -msgstr "Ajouter Plugin" - -#: eeschema/netlist_control.cpp:315 -msgid "Netlist command:" -msgstr "Commande netliste:" - -#: eeschema/netlist_control.cpp:319 -#: share/setpage.cpp:262 -msgid "Title:" -msgstr "Titre:" - -#: eeschema/netlist_control.cpp:334 -msgid "Plugin files:" -msgstr "Fichiers Plugins:" - -#: eeschema/netlist_control.cpp:354 -msgid "" -"Now, you must choose a title for this netlist control page\n" -"and close the dialog box" -msgstr "Maitenant, vous devez choisir un titre pour cette page de controle de netliste" - -#: eeschema/netlist_control.cpp:433 -msgid "Netlist files:" -msgstr "Fichiers Netlist:" - -#: eeschema/netlist_control.cpp:449 -msgid "Must be Annotated, Continue ?" -msgstr "Annotation nécessaire, continuer?" - #: eeschema/dialog_edit_component_in_schematic.cpp:135 msgid "Unit 1" msgstr "Unité 1" @@ -7054,8 +6996,8 @@ msgstr "Cmp. en &Libr." #: eeschema/eeconfig.cpp:70 #: kicad/files-io.cpp:131 -#: gerbview/readgerb.cpp:141 #: gerbview/dcode.cpp:260 +#: gerbview/readgerb.cpp:141 msgid "File " msgstr "Fichier " @@ -7134,6 +7076,10 @@ msgstr "Tri" msgid "Bad Bus Label: " msgstr "Mauvais label de Bus: " +#: eeschema/files-io.cpp:57 +msgid "Clear SubHierarchy ?" +msgstr "Supprimer la sous hiérarchie?" + #: eeschema/eelibs_read_libraryfiles.cpp:114 msgid "Start loading schematic libs" msgstr "Demarre chargement des librairies schématiques" @@ -7172,7 +7118,7 @@ msgstr "(alias de " #: eeschema/libedpart.cpp:206 #: eeschema/edit_component_in_lib.cpp:168 -#: eeschema/dialog_edit_component_in_lib.h:44 +#: eeschema/dialog_edit_component_in_lib.h:43 msgid "Lib Component Properties" msgstr "Propriétés du composant librairie" @@ -7365,14 +7311,14 @@ msgid "Add wire or bus label" msgstr "Addition de labels sur fils ou bus" #: eeschema/tool_sch.cpp:204 -#: eeschema/onrightclick.cpp:488 -#: eeschema/onrightclick.cpp:520 +#: eeschema/onrightclick.cpp:490 +#: eeschema/onrightclick.cpp:522 msgid "Add global label" msgstr "Addition de labels globaux" #: eeschema/tool_sch.cpp:208 -#: eeschema/onrightclick.cpp:482 -#: eeschema/onrightclick.cpp:514 +#: eeschema/onrightclick.cpp:484 +#: eeschema/onrightclick.cpp:516 msgid "Add junction" msgstr "Addition de jonctions" @@ -7628,7 +7574,7 @@ msgid "Rect Delete" msgstr "Supprimer Rect" #: eeschema/libedit_onrightclick.cpp:148 -#: eeschema/onrightclick.cpp:409 +#: eeschema/onrightclick.cpp:411 msgid "Move Text" msgstr "Déplacer Texte" @@ -7665,7 +7611,7 @@ msgid "Segment Delete" msgstr "Supprimer segment" #: eeschema/libedit_onrightclick.cpp:192 -#: eeschema/onrightclick.cpp:263 +#: eeschema/onrightclick.cpp:265 msgid "Move Field" msgstr "Déplace Champ" @@ -7718,7 +7664,7 @@ msgid "Pin Num Size to others" msgstr "Change taille Num pin autres pins" #: eeschema/libedit_onrightclick.cpp:255 -#: eeschema/onrightclick.cpp:584 +#: eeschema/onrightclick.cpp:586 msgid "Win. Zoom (Midd butt drag mouse)" msgstr "Win. Zoom (Midd butt drag mouse)" @@ -7731,7 +7677,7 @@ msgid "Mirror Block (ctrl + drag mouse)" msgstr "Bloc Miroir (ctrl + drag mouse)" #: eeschema/libedit_onrightclick.cpp:268 -#: eeschema/onrightclick.cpp:599 +#: eeschema/onrightclick.cpp:601 msgid "Del. Block (shift+ctrl + drag mouse)" msgstr "Effacement Bloc (shift+ctrl + drag mouse)" @@ -7739,249 +7685,249 @@ msgstr "Effacement Bloc (shift+ctrl + drag mouse)" msgid "Library browser" msgstr "Visualisateur des librairies" -#: eeschema/onrightclick.cpp:140 +#: eeschema/onrightclick.cpp:142 msgid "Leave Sheet" msgstr "Quitter sous-feuille" -#: eeschema/onrightclick.cpp:156 +#: eeschema/onrightclick.cpp:158 msgid "delete noconn" msgstr "Supprimer non connexion" -#: eeschema/onrightclick.cpp:166 +#: eeschema/onrightclick.cpp:168 msgid "Move bus entry" msgstr "Déplacer entrée de bus" -#: eeschema/onrightclick.cpp:168 +#: eeschema/onrightclick.cpp:170 msgid "set bus entry /" msgstr "Entrée de bus /" -#: eeschema/onrightclick.cpp:170 +#: eeschema/onrightclick.cpp:172 msgid "set bus entry \\" msgstr "Entrée de bus \\" -#: eeschema/onrightclick.cpp:172 +#: eeschema/onrightclick.cpp:174 msgid "delete bus entry" msgstr "Supprimer entrée de bus" -#: eeschema/onrightclick.cpp:176 +#: eeschema/onrightclick.cpp:178 msgid "delete Marker" msgstr "Supprimer Marqueur" -#: eeschema/onrightclick.cpp:226 +#: eeschema/onrightclick.cpp:228 msgid "End drawing" msgstr "Fin tracé" -#: eeschema/onrightclick.cpp:228 +#: eeschema/onrightclick.cpp:230 msgid "Delete drawing" msgstr "Supprimer Tracé" -#: eeschema/onrightclick.cpp:264 +#: eeschema/onrightclick.cpp:266 msgid "Rotate Field" msgstr "Rotation Champ" -#: eeschema/onrightclick.cpp:284 +#: eeschema/onrightclick.cpp:286 msgid "Move Component" msgstr "Déplace Composant" -#: eeschema/onrightclick.cpp:287 +#: eeschema/onrightclick.cpp:289 msgid "Drag Component" msgstr "Drag Composant" -#: eeschema/onrightclick.cpp:294 +#: eeschema/onrightclick.cpp:296 msgid "Rotate +" msgstr "Rotation +" -#: eeschema/onrightclick.cpp:300 +#: eeschema/onrightclick.cpp:302 msgid "Mirror ||" msgstr "Miroir ||" -#: eeschema/onrightclick.cpp:306 +#: eeschema/onrightclick.cpp:308 msgid "Orient Component" msgstr "Oriente Composant" -#: eeschema/onrightclick.cpp:324 +#: eeschema/onrightclick.cpp:326 #, c-format msgid "Unit %d %c" msgstr "Unité %d %c" -#: eeschema/onrightclick.cpp:335 +#: eeschema/onrightclick.cpp:337 msgid "Edit Component" msgstr "Edite Composant" -#: eeschema/onrightclick.cpp:339 +#: eeschema/onrightclick.cpp:341 msgid "Copy Component" msgstr "Copie composant" -#: eeschema/onrightclick.cpp:340 +#: eeschema/onrightclick.cpp:342 msgid "Delete Component" msgstr "Supprime Composant" -#: eeschema/onrightclick.cpp:359 +#: eeschema/onrightclick.cpp:361 msgid "Move Glabel" msgstr "Déplace Label Global" -#: eeschema/onrightclick.cpp:360 +#: eeschema/onrightclick.cpp:362 msgid "Rotate GLabel (R)" msgstr "Rot. Label Global (R)" -#: eeschema/onrightclick.cpp:361 +#: eeschema/onrightclick.cpp:363 msgid "Edit GLabel" msgstr "Editer Label Global" -#: eeschema/onrightclick.cpp:362 +#: eeschema/onrightclick.cpp:364 msgid "Delete Glabel" msgstr "Supprimer Label Global" -#: eeschema/onrightclick.cpp:366 -#: eeschema/onrightclick.cpp:416 +#: eeschema/onrightclick.cpp:368 +#: eeschema/onrightclick.cpp:418 msgid "Change to Label" msgstr "Change en Label" -#: eeschema/onrightclick.cpp:368 -#: eeschema/onrightclick.cpp:393 +#: eeschema/onrightclick.cpp:370 +#: eeschema/onrightclick.cpp:395 msgid "Change to Text" msgstr "Change en Texte" -#: eeschema/onrightclick.cpp:370 -#: eeschema/onrightclick.cpp:395 -#: eeschema/onrightclick.cpp:420 +#: eeschema/onrightclick.cpp:372 +#: eeschema/onrightclick.cpp:397 +#: eeschema/onrightclick.cpp:422 msgid "Change Type" msgstr "Change Type" -#: eeschema/onrightclick.cpp:384 +#: eeschema/onrightclick.cpp:386 msgid "Move Label" msgstr "Déplace Label" -#: eeschema/onrightclick.cpp:385 +#: eeschema/onrightclick.cpp:387 msgid "Rotate Label (R)" msgstr "Rot. Label (R)" -#: eeschema/onrightclick.cpp:386 +#: eeschema/onrightclick.cpp:388 msgid "Edit Label" msgstr "Editer Label" -#: eeschema/onrightclick.cpp:387 +#: eeschema/onrightclick.cpp:389 msgid "Delete Label" msgstr "Supprimer Label:" -#: eeschema/onrightclick.cpp:391 -#: eeschema/onrightclick.cpp:418 +#: eeschema/onrightclick.cpp:393 +#: eeschema/onrightclick.cpp:420 msgid "Change to Glabel" msgstr "Change en Label Global" -#: eeschema/onrightclick.cpp:410 +#: eeschema/onrightclick.cpp:412 msgid "Rotate Text (R)" msgstr "Rot. Texte (R)" -#: eeschema/onrightclick.cpp:411 +#: eeschema/onrightclick.cpp:413 msgid "Edit Text" msgstr "Editer Texte" -#: eeschema/onrightclick.cpp:412 +#: eeschema/onrightclick.cpp:414 msgid "Delete Text" msgstr "Supprimer Texte" -#: eeschema/onrightclick.cpp:438 -#: eeschema/onrightclick.cpp:478 +#: eeschema/onrightclick.cpp:440 +#: eeschema/onrightclick.cpp:480 msgid "Break Wire" msgstr "Briser fil" -#: eeschema/onrightclick.cpp:441 +#: eeschema/onrightclick.cpp:443 msgid "delete junction" msgstr "Supprimer jonction" -#: eeschema/onrightclick.cpp:446 -#: eeschema/onrightclick.cpp:472 +#: eeschema/onrightclick.cpp:448 +#: eeschema/onrightclick.cpp:474 msgid "Delete node" msgstr "Supprimer Noeud" -#: eeschema/onrightclick.cpp:448 -#: eeschema/onrightclick.cpp:474 +#: eeschema/onrightclick.cpp:450 +#: eeschema/onrightclick.cpp:476 msgid "Delete connection" msgstr "Supprimer connexion" -#: eeschema/onrightclick.cpp:465 +#: eeschema/onrightclick.cpp:467 msgid "End Wire" msgstr "Fin Fil" -#: eeschema/onrightclick.cpp:467 +#: eeschema/onrightclick.cpp:469 msgid "Delete Wire" msgstr "Supprimer Fil" -#: eeschema/onrightclick.cpp:483 -#: eeschema/onrightclick.cpp:515 +#: eeschema/onrightclick.cpp:485 +#: eeschema/onrightclick.cpp:517 msgid "Add label" msgstr "Ajout Label" -#: eeschema/onrightclick.cpp:504 +#: eeschema/onrightclick.cpp:506 msgid "End Bus" msgstr "Fin Bus" -#: eeschema/onrightclick.cpp:507 +#: eeschema/onrightclick.cpp:509 msgid "Delete Bus" msgstr "Supprimer Bus" -#: eeschema/onrightclick.cpp:511 +#: eeschema/onrightclick.cpp:513 msgid "Break Bus" msgstr "Briser Bus" -#: eeschema/onrightclick.cpp:533 +#: eeschema/onrightclick.cpp:535 msgid "Enter Sheet" msgstr "Enter dans Feuille" -#: eeschema/onrightclick.cpp:535 +#: eeschema/onrightclick.cpp:537 msgid "Move Sheet" msgstr "Déplace Feuille" -#: eeschema/onrightclick.cpp:540 +#: eeschema/onrightclick.cpp:542 msgid "Place Sheet" msgstr "Place Feuille" -#: eeschema/onrightclick.cpp:544 +#: eeschema/onrightclick.cpp:546 msgid "Edit Sheet" msgstr "Edite Feuille" -#: eeschema/onrightclick.cpp:545 +#: eeschema/onrightclick.cpp:547 msgid "Resize Sheet" msgstr "Redimensionne feuille" -#: eeschema/onrightclick.cpp:548 +#: eeschema/onrightclick.cpp:550 msgid "Cleanup PinSheets" msgstr "Nettoyage de la feuille" -#: eeschema/onrightclick.cpp:549 +#: eeschema/onrightclick.cpp:551 msgid "Delete Sheet" msgstr "Supprimer Feuille" -#: eeschema/onrightclick.cpp:562 +#: eeschema/onrightclick.cpp:564 msgid "Move PinSheet" msgstr "Déplace Connecteur de hiérarchie" -#: eeschema/onrightclick.cpp:564 +#: eeschema/onrightclick.cpp:566 msgid "Edit PinSheet" msgstr "Edit Connecteur de hiérarchie" -#: eeschema/onrightclick.cpp:567 +#: eeschema/onrightclick.cpp:569 msgid "Delete PinSheet" msgstr "Supprimer Connecteur de hiérarchie" -#: eeschema/onrightclick.cpp:592 +#: eeschema/onrightclick.cpp:594 msgid "Other block commands" msgstr "Autres commandes de bloc" -#: eeschema/onrightclick.cpp:593 +#: eeschema/onrightclick.cpp:595 msgid "Save Block" msgstr "Sauver Bloc" -#: eeschema/onrightclick.cpp:597 +#: eeschema/onrightclick.cpp:599 msgid "Drag Block (ctrl + drag mouse)" msgstr "Drag Bloc (ctrl + drag mouse)" -#: eeschema/onrightclick.cpp:601 +#: eeschema/onrightclick.cpp:603 msgid "Mirror Block ||" msgstr "Miroir Bloc ||" -#: eeschema/onrightclick.cpp:605 +#: eeschema/onrightclick.cpp:607 msgid "Copy to Clipboard" msgstr "Copie dans Presse papier" @@ -8103,14 +8049,6 @@ msgstr "Contours:" msgid "Texts:" msgstr "Textes:" -#: cvpcb/setvisu.cpp:40 -msgid "Footprint: " -msgstr "Module: " - -#: cvpcb/setvisu.cpp:43 -msgid "Lib: " -msgstr "Lib: " - #: cvpcb/autosel.cpp:68 #, c-format msgid "Library: <%s> not found" @@ -8250,6 +8188,14 @@ msgstr "Impossible de cr msgid "Load Net List" msgstr "Lire Netliste" +#: cvpcb/setvisu.cpp:43 +msgid "Footprint: " +msgstr "Module: " + +#: cvpcb/setvisu.cpp:46 +msgid "Lib: " +msgstr "Lib: " + #: cvpcb/listboxes.cpp:310 #, c-format msgid "Footprints: %d" @@ -8305,6 +8251,11 @@ msgstr "Choisir les fontes et leur taille pour les dialogues, infos et ligne d' msgid "Netlist Format: Pcad" msgstr " Format NetListe: Pcad" +#: cvpcb/displayframe.cpp:114 +#: pcbnew/dialog_display_options.h:43 +msgid "Display Options" +msgstr "Options d'affichage" + #: cvpcb/readschematicnetlist.cpp:76 msgid "Netlist Format: EESchema" msgstr " Formats NetListe: EESchema" @@ -8314,11 +8265,6 @@ msgstr " Formats NetListe: EESchema" msgid "Netlist error: %s" msgstr "Erreur Netliste: %s" -#: cvpcb/displayframe.cpp:113 -#: pcbnew/dialog_display_options.h:44 -msgid "Display Options" -msgstr "Options d'affichage" - #: cvpcb/tool_cvpcb.cpp:35 msgid "Open Netlist" msgstr "Lire Netliste" @@ -8407,6 +8353,10 @@ msgstr "Ouvrir la documentation de cvpcb" msgid "Read Cfg" msgstr "Lire Cfg" +#: cvpcb/dialog_cvpcb_config.cpp:140 +msgid "&PcbNew" +msgstr "&PcbNew" + #: cvpcb/dialog_cvpcb_config.cpp:141 msgid "&ViewLogic" msgstr "&ViewLogic" @@ -8832,6 +8782,15 @@ msgstr "" msgid "GerbView is already running. Continue?" msgstr "Gerbview est est cours d'exécution. Continuer ?" +#: gerbview/rs274x.cpp:317 +#, c-format +msgid "Command <%c%c> ignored by Gerbview" +msgstr "Commande <%c%c> ignorée par Gerbview" + +#: gerbview/rs274x.cpp:354 +msgid "Too many include files!!" +msgstr "Trop de fichiers inclus!!" + #: gerbview/affiche.cpp:34 #: gerbview/tool_gerber.cpp:311 msgid "Layer " @@ -8857,15 +8816,9 @@ msgstr "????" msgid "No layer selected" msgstr "Pas de couche sélectionnée" -#: gerbview/readgerb.cpp:234 -#, c-format -msgid "%d errors while reading Gerber file [%s]" -msgstr "%d erreurs pendant lecture fichier gerber [%s]" - -#: gerbview/readgerb.cpp:252 -#: gerbview/files.cpp:175 -msgid "D codes files:" -msgstr "Fichiers D-Codes:" +#: gerbview/block.cpp:267 +msgid "Ok to delete block ?" +msgstr "Ok pour effacer le bloc" #: gerbview/initpcb.cpp:34 msgid "Current Data will be lost ?" @@ -8898,15 +8851,6 @@ msgstr "Ne pas exporter" msgid "Gerbview Layer Colors:" msgstr "Gerbview: Couleur des couches" -#: gerbview/files.cpp:81 -msgid "Not yet available..." -msgstr "non encore disponible" - -#: gerbview/files.cpp:128 -#: gerbview/files.cpp:206 -msgid "Gerber files:" -msgstr "Fichiers Gerber:" - #: gerbview/options.cpp:147 msgid "Gerbview Options" msgstr "Gerbview Options " @@ -8935,10 +8879,6 @@ msgstr "Spots:" msgid "Show D codes" msgstr "Monter DCodes" -#: gerbview/block.cpp:267 -msgid "Ok to delete block ?" -msgstr "Ok pour effacer le bloc" - #: gerbview/dcode.cpp:438 msgid "List D codes" msgstr "Liste D-Codes" @@ -8959,6 +8899,20 @@ msgstr "Ext. Fichiers Gerber" msgid "D code File Ext:" msgstr "Ext. Fichiers DCodes:" +#: gerbview/files.cpp:83 +msgid "Not yet available..." +msgstr "non encore disponible" + +#: gerbview/files.cpp:131 +#: gerbview/files.cpp:216 +msgid "Gerber files:" +msgstr "Fichiers Gerber:" + +#: gerbview/files.cpp:183 +#: gerbview/readgerb.cpp:265 +msgid "D codes files:" +msgstr "Fichiers D-Codes:" + #: gerbview/onrightclick.cpp:55 msgid "Copy Block (shift mouse)" msgstr "Copie Bloc (shift mouse)" @@ -8980,14 +8934,10 @@ msgstr "Couche modifi msgid "Save config file" msgstr "Sauver config" -#: gerbview/rs274x.cpp:285 +#: gerbview/readgerb.cpp:247 #, c-format -msgid "Command <%c%c> ignored by Gerbview" -msgstr "Commande <%c%c> ignorée par Gerbview" - -#: gerbview/rs274x.cpp:316 -msgid "Too many include files!!" -msgstr "Trop de fichiers inclus!!" +msgid "%d errors while reading Gerber file [%s]" +msgstr "%d erreurs pendant lecture fichier gerber [%s]" #: gerbview/export_to_pcbnew.cpp:35 msgid "Board file name:" @@ -9186,126 +9136,6 @@ msgstr "X" msgid "Y" msgstr "Y" -#: common/common.cpp:48 -msgid " (\"):" -msgstr " (\"):" - -#: common/common.cpp:278 -msgid "Copper " -msgstr "Cuivre " - -#: common/common.cpp:278 -msgid "Inner L1 " -msgstr "Interne 1" - -#: common/common.cpp:278 -msgid "Inner L2 " -msgstr "Interne 2" - -#: common/common.cpp:278 -msgid "Inner L3 " -msgstr "Interne 3" - -#: common/common.cpp:279 -msgid "Inner L4 " -msgstr "Interne 4" - -#: common/common.cpp:279 -msgid "Inner L5 " -msgstr "Interne 5" - -#: common/common.cpp:279 -msgid "Inner L6 " -msgstr "Interne 6" - -#: common/common.cpp:279 -msgid "Inner L7 " -msgstr "Interne 7" - -#: common/common.cpp:280 -msgid "Inner L8 " -msgstr "Interne 8" - -#: common/common.cpp:280 -msgid "Inner L9 " -msgstr "Interne 9" - -#: common/common.cpp:280 -msgid "Inner L10" -msgstr "Interne 10" - -#: common/common.cpp:280 -msgid "Inner L11" -msgstr "Interne 11" - -#: common/common.cpp:281 -msgid "Inner L12" -msgstr "Interne 12" - -#: common/common.cpp:281 -msgid "Inner L13" -msgstr "Interne 13" - -#: common/common.cpp:281 -msgid "Inner L14" -msgstr "Interne 14" - -#: common/common.cpp:282 -msgid "Adhes Cop" -msgstr "Adhes Cu " - -#: common/common.cpp:282 -msgid "Adhes Cmp" -msgstr "Adhe Cmp" - -#: common/common.cpp:282 -msgid "SoldP Cop" -msgstr "SoldP Cu " - -#: common/common.cpp:282 -msgid "SoldP Cmp" -msgstr "SoldP Cmp" - -#: common/common.cpp:283 -msgid "SilkS Cop" -msgstr "Sérigr Cu " - -#: common/common.cpp:283 -msgid "SilkS Cmp" -msgstr "Sérigr Cmp" - -#: common/common.cpp:283 -msgid "Mask Cop " -msgstr "Masque Cu " - -#: common/common.cpp:283 -msgid "Mask Cmp " -msgstr "Masque Cmp" - -#: common/common.cpp:284 -msgid "Drawings " -msgstr "Drawings " - -#: common/common.cpp:284 -msgid "Comments " -msgstr "Comments " - -#: common/common.cpp:284 -msgid "Eco1 " -msgstr "Eco1 " - -#: common/common.cpp:284 -msgid "Eco2 " -msgstr "Eco2 " - -#: common/common.cpp:285 -msgid "Edges Pcb" -msgstr "Contour Pcb" - -#: common/common.cpp:285 -msgid "--- " -msgstr "--- " - #: common/gestfich.cpp:622 msgid "No default editor found, you must choose it" msgstr "Pas d'éditeur par défaut trouvé, vous devez en choisir un" @@ -9429,6 +9259,130 @@ msgstr "Ne peut trouver le visualisateur Pdf %s" msgid "Colors" msgstr "Couleurs" +#: common/common.cpp:48 +msgid " (\"):" +msgstr " (\"):" + +#: common/common.cpp:277 +msgid "Copper " +msgstr "Cuivre " + +#: common/common.cpp:277 +msgid "Inner L1 " +msgstr "Interne 1" + +#: common/common.cpp:277 +msgid "Inner L2 " +msgstr "Interne 2" + +#: common/common.cpp:277 +msgid "Inner L3 " +msgstr "Interne 3" + +#: common/common.cpp:278 +msgid "Inner L4 " +msgstr "Interne 4" + +#: common/common.cpp:278 +msgid "Inner L5 " +msgstr "Interne 5" + +#: common/common.cpp:278 +msgid "Inner L6 " +msgstr "Interne 6" + +#: common/common.cpp:278 +msgid "Inner L7 " +msgstr "Interne 7" + +#: common/common.cpp:279 +msgid "Inner L8 " +msgstr "Interne 8" + +#: common/common.cpp:279 +msgid "Inner L9 " +msgstr "Interne 9" + +#: common/common.cpp:279 +msgid "Inner L10" +msgstr "Interne 10" + +#: common/common.cpp:279 +msgid "Inner L11" +msgstr "Interne 11" + +#: common/common.cpp:280 +msgid "Inner L12" +msgstr "Interne 12" + +#: common/common.cpp:280 +msgid "Inner L13" +msgstr "Interne 13" + +#: common/common.cpp:280 +msgid "Inner L14" +msgstr "Interne 14" + +#: common/common.cpp:281 +msgid "Adhes Cop" +msgstr "Adhes Cu " + +#: common/common.cpp:281 +msgid "Adhes Cmp" +msgstr "Adhe Cmp" + +#: common/common.cpp:281 +msgid "SoldP Cop" +msgstr "SoldP Cu " + +#: common/common.cpp:281 +msgid "SoldP Cmp" +msgstr "SoldP Cmp" + +#: common/common.cpp:282 +msgid "SilkS Cop" +msgstr "Sérigr Cu " + +#: common/common.cpp:282 +msgid "SilkS Cmp" +msgstr "Sérigr Cmp" + +#: common/common.cpp:282 +msgid "Mask Cop " +msgstr "Masque Cu " + +#: common/common.cpp:282 +msgid "Mask Cmp " +msgstr "Masque Cmp" + +#: common/common.cpp:283 +msgid "Drawings " +msgstr "Drawings " + +#: common/common.cpp:283 +msgid "Comments " +msgstr "Comments " + +#: common/common.cpp:283 +msgid "Eco1 " +msgstr "Eco1 " + +#: common/common.cpp:283 +msgid "Eco2 " +msgstr "Eco2 " + +#: common/common.cpp:284 +msgid "Edges Pcb" +msgstr "Contour Pcb" + +#: common/common.cpp:284 +msgid "--- " +msgstr "--- " + +#: common/confirm.cpp:97 +msgid "Infos:" +msgstr "Infos:" + #: common/block_commande.cpp:56 msgid "Block Move" msgstr "Move Bloc" @@ -9753,18 +9707,6 @@ msgstr "S msgid "grid user" msgstr "grille user" -#: share/drawframe.cpp:130 -msgid "font for info display" -msgstr "fonte pour affichage infos" - -#: share/drawframe.cpp:372 -msgid "Inch" -msgstr "Pouce" - -#: share/drawframe.cpp:380 -msgid "??" -msgstr "??" - #: share/wxprint.cpp:146 msgid "Error Init Printer info" msgstr "Erreur Init info imprimante" @@ -9928,9 +9870,17 @@ msgstr "" "\n" "International wiki:\n" -#: pcbnew/find.h:39 -msgid "Find" -msgstr "Chercher" +#: share/drawframe.cpp:130 +msgid "font for info display" +msgstr "fonte pour affichage infos" + +#: share/drawframe.cpp:377 +msgid "Inch" +msgstr "Pouce" + +#: share/drawframe.cpp:385 +msgid "??" +msgstr "??" #: pcbnew/gen_self.h:217 msgid "Length(inch):" @@ -9953,93 +9903,91 @@ msgstr "Incapable de cr msgid "Segm count = %d, Lenght = " msgstr "Nbr segm = %d, Longueur = " -#: pcbnew/dialog_drc.h:57 -msgid "DRC Control" -msgstr "Controle ERC" +#: pcbnew/find.h:38 +msgid "Find" +msgstr "Chercher" -#: pcbnew/zones.h:54 -msgid "Fill Zones Options" -msgstr "Options de remplissage de Zone" - -#: pcbnew/dialog_track_options.h:43 -msgid "Tracks and Vias Sizes" -msgstr "Dims pistes et vias" +#: pcbnew/dialog_setup_libs.h:43 +#: eeschema/dialog_edit_label.h:40 +#: eeschema/dialog_eeschema_config.h:50 +#: cvpcb/dialog_cvpcb_config.h:39 +msgid "Dialog" +msgstr "Dialog" #: pcbnew/dialog_pad_edit.h:62 msgid "Pad properties" msgstr "Propriétés des Pads" -#: pcbnew/dialog_setup_libs.h:44 -#: eeschema/dialog_edit_label.h:41 -#: eeschema/dialog_eeschema_config.h:51 -#: cvpcb/dialog_cvpcb_config.h:40 -msgid "Dialog" -msgstr "Dialog" - -#: pcbnew/dialog_netlist.h:41 +#: pcbnew/dialog_netlist.h:40 msgid "Netlist: " msgstr "Netliste: " -#: pcbnew/cleaningoptions_dialog.h:49 -#: pcbnew/win_eda_cleaningoptionsframe.h:50 +#: pcbnew/cleaningoptions_dialog.h:48 msgid "Cleaning options" msgstr "Options de nettoyage" -#: pcbnew/dialog_initpcb.h:39 -msgid "Global Delete" -msgstr "Effacements Généraux" - -#: pcbnew/dialog_general_options.h:45 -#: eeschema/dialog_options.h:56 +#: pcbnew/dialog_general_options.h:44 +#: eeschema/dialog_options.h:55 msgid "General Options" msgstr "Options générales" -#: pcbnew/dialog_edit_mod_text.h:44 +#: pcbnew/dialog_edit_mod_text.h:43 msgid "TextMod properties" msgstr "Propriétés du Texte sur Module" -#: eeschema/plotps.h:51 +#: pcbnew/zones.h:54 +msgid "Fill Zones Options" +msgstr "Options de remplissage de Zone" + +#: pcbnew/dialog_drc.h:56 +msgid "DRC Control" +msgstr "Controle ERC" + +#: pcbnew/dialog_initpcb.h:38 +msgid "Global Delete" +msgstr "Effacements Généraux" + +#: pcbnew/dialog_track_options.h:42 +msgid "Tracks and Vias Sizes" +msgstr "Dims pistes et vias" + +#: eeschema/plotps.h:50 msgid "EESchema Plot PS" msgstr "EESchema Tracé PS" -#: eeschema/symbtext.h:43 -msgid "Graphic text properties" -msgstr "Propriétés du texte" - #: eeschema/plothpgl.h:46 msgid "EESchema Plot HPGL" msgstr "EESchema Tracé HPGL" -#: eeschema/dialog_create_component.h:46 -msgid "Component Creation" -msgstr "Creation Composant:" - -#: eeschema/pinedit-dialog.h:66 +#: eeschema/pinedit-dialog.h:65 msgid "Pin properties" msgstr "Propriétés des Pins" -#: eeschema/dialog_find.h:40 -msgid "EESchema Locate" -msgstr "Recherche" - -#: eeschema/optionsframe.h:60 -#: eeschema/optionsframe.h:63 -msgid "optionsframe" -msgstr "optionsframe" - -#: eeschema/dialog_erc.h:58 +#: eeschema/dialog_erc.h:59 msgid "EESchema Erc" msgstr "EESchema Erc" -#: eeschema/annotate_dialog.h:54 +#: eeschema/annotate_dialog.h:53 msgid "EESchema Annotation" msgstr "Numérotation des composants" -#: eeschema/sheet.h:44 +#: eeschema/dialog_find.h:39 +msgid "EESchema Locate" +msgstr "Recherche" + +#: eeschema/sheet.h:43 msgid "Sheet properties" msgstr "Propriétés de la feuille" -#: eeschema/dialog_cmp_graphic_properties.h:44 +#: eeschema/symbtext.h:42 +msgid "Graphic text properties" +msgstr "Propriétés du texte" + +#: eeschema/dialog_create_component.h:45 +msgid "Component Creation" +msgstr "Creation Composant:" + +#: eeschema/dialog_cmp_graphic_properties.h:43 msgid "Graphic shape properties" msgstr "Propriétés du dessin" @@ -10187,16 +10135,15 @@ msgstr "Autres" msgid "D codes id." msgstr "DCodes id." -#: common/svg_print.h:45 -#: share/svg_print.h:51 -msgid "Create SVG file" -msgstr "Créer Fichier SVG" - -#: share/dialog_print.h:52 -msgid "Print" -msgstr "Imprimer" - #: share/setpage.h:54 msgid "Page Settings" msgstr "Ajustage opt Page" +#: share/svg_print.h:50 +msgid "Create SVG file" +msgstr "Créer Fichier SVG" + +#: share/dialog_print.h:51 +msgid "Print" +msgstr "Imprimer" + diff --git a/libs.win b/libs.win index 4fc75cc5d0..ffd50823e9 100644 --- a/libs.win +++ b/libs.win @@ -43,10 +43,11 @@ endif SYSWXLIB = `$(WXWIN)/wx-config --libs gl`\ -lwxpng-$(LIBVERSION) -lwxjpeg-$(LIBVERSION) -lwxzlib-$(LIBVERSION) $(PYLIBS) +CC = gcc + .cpp.o: gcc -c -Wall $(ALL_CPPFLAGS) $(ALL_CXXFLAGS) $(EXTRACPPFLAGS) -o $@ $*.cpp - # Settings for Cyginw/Mingw32 # Some versions of windres cannot cope with the --preprocessor # option. Uncomment the RCPREPROCESSOR line below if yours can. diff --git a/pcbnew/basepcbframe.cpp b/pcbnew/basepcbframe.cpp index 42db15ae9c..c255015974 100644 --- a/pcbnew/basepcbframe.cpp +++ b/pcbnew/basepcbframe.cpp @@ -95,7 +95,10 @@ int WinEDA_BasePcbFrame::BestZoom( void ) } -void WinEDA_BasePcbFrame::ReCreateMenuBar( void ) // fonction virtuelle +/*************************************************/ +void WinEDA_BasePcbFrame::ReCreateMenuBar( void ) +/*************************************************/ +// Virtual function { } @@ -106,7 +109,7 @@ void WinEDA_BasePcbFrame::ReCreateMenuBar( void ) // fonction virtuelle void WinEDA_BasePcbFrame::Show3D_Frame( wxCommandEvent& event ) /***********************************************************/ -/* Ouvre la frame d'affichage 3D +/* Creat and show the 3D frame display */ { #ifndef GERBVIEW @@ -151,8 +154,8 @@ void WinEDA_BasePcbFrame::GetComponentFromRedoList( void ) /****************************************************************/ void WinEDA_BasePcbFrame::SwitchLayer( wxDC* DC, int layer ) /*****************************************************************/ +//Note: virtual, overridden in WinEDA_PcbFrame; { - //Note: virtual, overridden in WinEDA_PcbFrame; int preslayer = GetScreen()->m_Active_Layer; //if there is only one layer, don't switch. @@ -174,9 +177,9 @@ void WinEDA_BasePcbFrame::SwitchLayer( wxDC* DC, int layer ) -/*****************************************************************/ +/**********************************************************************/ void WinEDA_BasePcbFrame::ProcessItemSelection( wxCommandEvent& event ) -/*****************************************************************/ +/**********************************************************************/ { int id = event.GetId(); diff --git a/pcbnew/controle.cpp b/pcbnew/controle.cpp index 8df9625896..279eeb0428 100644 --- a/pcbnew/controle.cpp +++ b/pcbnew/controle.cpp @@ -16,113 +16,15 @@ #include "bitmaps.h" - -/*******************************************/ -void RemoteCommand( const char* cmdline ) -/*******************************************/ - -/** Read a remote command send by eeschema via a socket, - * port KICAD_PCB_PORT_SERVICE_NUMBER (currently 4242) - * @param cmdline = received command from eeschema - * Commands are - * $PART: "reference" put cursor on component - * $PIN: "pin name" $PART: "reference" put cursor on the footprint pin - */ -{ - char line[1024]; - wxString msg; - char* idcmd; - char* text; - MODULE* module = 0; - WinEDA_PcbFrame* frame = EDA_Appl->m_PcbFrame; - - strncpy( line, cmdline, sizeof(line) - 1 ); - - idcmd = strtok( line, " \n\r" ); - text = strtok( NULL, " \n\r" ); - if( (idcmd == NULL) || (text == NULL) ) - return; - - if( strcmp( idcmd, "$PART:" ) == 0 ) - { - msg = CONV_FROM_UTF8( text ); - - module = ReturnModule( frame->m_Pcb, msg ); - - msg.Printf( _( "Locate module %s %s" ), msg.GetData(), - module ? wxT( "Ok" ) : wxT( "not found" ) ); - - frame->Affiche_Message( msg ); - if( module ) - { - wxClientDC dc( frame->DrawPanel ); - - frame->DrawPanel->PrepareGraphicContext( &dc ); - frame->DrawPanel->CursorOff( &dc ); - frame->GetScreen()->m_Curseur = module->m_Pos; - frame->DrawPanel->CursorOn( &dc ); - } - } - - if( idcmd && strcmp( idcmd, "$PIN:" ) == 0 ) - { - wxString pinName, modName; - D_PAD* pad = NULL; - int netcode = -1; - - pinName = CONV_FROM_UTF8( text ); - - text = strtok( NULL, " \n\r" ); - if( text && strcmp( text, "$PART:" ) == 0 ) - text = strtok( NULL, "\n\r" ); - - wxClientDC dc( frame->DrawPanel ); - - frame->DrawPanel->PrepareGraphicContext( &dc ); - - modName = CONV_FROM_UTF8( text ); - module = ReturnModule( frame->m_Pcb, modName ); - if( module ) - pad = ReturnPad( module, pinName ); - - if( pad ) - netcode = pad->m_NetCode; - - if( netcode > 0 ) /* hightlighted the net selected net*/ - { - if( g_HightLigt_Status ) /* erase the old hightlighted net */ - frame->Hight_Light( &dc ); - - g_HightLigth_NetCode = netcode; - frame->Hight_Light( &dc ); /* hightlighted the new one */ - - frame->DrawPanel->CursorOff( &dc ); - frame->GetScreen()->m_Curseur = pad->m_Pos; - frame->DrawPanel->CursorOn( &dc ); - } - - if( module == NULL ) - msg.Printf( _( "module %s not found" ), text ); - else if( pad == NULL ) - msg.Printf( _( "Pin %s (module %s) not found" ), pinName.GetData(), modName.GetData() ); - else - msg.Printf( _( "Locate Pin %s (module %s)" ), pinName.GetData(), modName.GetData() ); - - frame->Affiche_Message( msg ); - } - - if( module ) // if found, center the module on screen. - frame->Recadre_Trace( false ); -} - - +/*************************************************************************************/ +static BOARD_ITEM* AllAreModulesAndReturnSmallestIfSo( GENERAL_COLLECTOR* aCollector ) +/*************************************************************************************/ /** * Function AllAreModulesAndReturnSmallestIfSo * tests that all items in the collection are MODULEs and if so, returns the * smallest MODULE. * @return BOARD_ITEM* - The smallest or NULL. */ -static BOARD_ITEM* AllAreModulesAndReturnSmallestIfSo( GENERAL_COLLECTOR* aCollector ) { int count = aCollector->GetCount(); diff --git a/pcbnew/cross-probing.cpp b/pcbnew/cross-probing.cpp new file mode 100644 index 0000000000..66bd126a40 --- /dev/null +++ b/pcbnew/cross-probing.cpp @@ -0,0 +1,185 @@ +/*****************************************************************/ +/* Cross probing function: handle communication to/from eeschema */ +/*****************************************************************/ + +/* cross-probing.cpp */ + +#include "fctsys.h" + +#include "common.h" +#include "pcbnew.h" +#include "eda_dde.h" + +#include "id.h" +#include "collectors.h" + +#include "protos.h" + + +/*******************************************/ +void RemoteCommand( const char* cmdline ) +/*******************************************/ + +/** Read a remote command send by eeschema via a socket, + * port KICAD_PCB_PORT_SERVICE_NUMBER (currently 4242) + * @param cmdline = received command from eeschema + * Commands are + * $PART: "reference" put cursor on component + * $PIN: "pin name" $PART: "reference" put cursor on the footprint pin + */ +{ + char line[1024]; + wxString msg; + char* idcmd; + char* text; + MODULE* module = 0; + WinEDA_PcbFrame* frame = EDA_Appl->m_PcbFrame; + + strncpy( line, cmdline, sizeof(line) - 1 ); + + idcmd = strtok( line, " \n\r" ); + text = strtok( NULL, " \n\r" ); + if( (idcmd == NULL) || (text == NULL) ) + return; + + if( strcmp( idcmd, "$PART:" ) == 0 ) + { + msg = CONV_FROM_UTF8( text ); + + module = ReturnModule( frame->m_Pcb, msg ); + + msg.Printf( _( "Locate module %s %s" ), msg.GetData(), + module ? wxT( "Ok" ) : wxT( "not found" ) ); + + frame->Affiche_Message( msg ); + if( module ) + { + wxClientDC dc( frame->DrawPanel ); + + frame->DrawPanel->PrepareGraphicContext( &dc ); + frame->DrawPanel->CursorOff( &dc ); + frame->GetScreen()->m_Curseur = module->m_Pos; + frame->DrawPanel->CursorOn( &dc ); + } + } + + if( idcmd && strcmp( idcmd, "$PIN:" ) == 0 ) + { + wxString pinName, modName; + D_PAD* pad = NULL; + int netcode = -1; + + pinName = CONV_FROM_UTF8( text ); + + text = strtok( NULL, " \n\r" ); + if( text && strcmp( text, "$PART:" ) == 0 ) + text = strtok( NULL, "\n\r" ); + + wxClientDC dc( frame->DrawPanel ); + + frame->DrawPanel->PrepareGraphicContext( &dc ); + + modName = CONV_FROM_UTF8( text ); + module = ReturnModule( frame->m_Pcb, modName ); + if( module ) + pad = ReturnPad( module, pinName ); + + if( pad ) + netcode = pad->m_NetCode; + + if( netcode > 0 ) /* hightlighted the net selected net*/ + { + if( g_HightLigt_Status ) /* erase the old hightlighted net */ + frame->Hight_Light( &dc ); + + g_HightLigth_NetCode = netcode; + frame->Hight_Light( &dc ); /* hightlighted the new one */ + + frame->DrawPanel->CursorOff( &dc ); + frame->GetScreen()->m_Curseur = pad->m_Pos; + frame->DrawPanel->CursorOn( &dc ); + } + + if( module == NULL ) + msg.Printf( _( "module %s not found" ), text ); + else if( pad == NULL ) + msg.Printf( _( "Pin %s (module %s) not found" ), pinName.GetData(), modName.GetData() ); + else + msg.Printf( _( "Locate Pin %s (module %s)" ), pinName.GetData(), modName.GetData() ); + + frame->Affiche_Message( msg ); + } + + if( module ) // if found, center the module on screen. + frame->Recadre_Trace( false ); +} + + +// see wxstruct.h +/**************************************************************************/ +void WinEDA_PcbFrame::SendMessageToEESCHEMA( BOARD_ITEM* objectToSync ) +/**************************************************************************/ +/** Send a remote command to eeschema via a socket, + * @param objectToSync = item to be located on schematic (module, pin or text) + * Commands are + * $PART: "reference" put cursor on component anchor + * $PART: "reference" $PAD: "pad number" put cursor on the component pin + * $PART: "reference" $REF: "reference" put cursor on the component ref + * $PART: "reference" $VAL: "value" put cursor on the component value + */ +{ + char cmd[1024]; + const char* text_key; + MODULE* module = NULL; + D_PAD* pad; + TEXTE_MODULE* text_mod; + wxString msg; + + if( objectToSync == NULL ) + return; + + switch( objectToSync->Type() ) + { + case TYPEMODULE: + module = (MODULE*) objectToSync; + sprintf( cmd, "$PART: \"%s\"", + CONV_TO_UTF8( module->m_Reference->m_Text ) ); + break; + + case TYPEPAD: + module = (MODULE*) objectToSync->m_Parent; + pad = (D_PAD*) objectToSync; + msg = pad->ReturnStringPadName(); + sprintf( cmd, "$PART: \"%s\" $PAD: \"%s\"", + CONV_TO_UTF8( module->m_Reference->m_Text ), + CONV_TO_UTF8( msg ) ); + break; + + case TYPETEXTEMODULE: + #define REFERENCE 0 + #define VALUE 1 + module = (MODULE*) objectToSync->m_Parent; + text_mod = (TEXTE_MODULE*) objectToSync; + if( text_mod->m_Type == REFERENCE ) + text_key = "$REF:"; + else if( text_mod->m_Type == VALUE ) + text_key = "$VAL:"; + else + break; + + sprintf( cmd, "$PART: \"%s\" %s \"%s\"", + CONV_TO_UTF8( module->m_Reference->m_Text ), + text_key, + CONV_TO_UTF8( text_mod->m_Text ) ); + break; + + default: + break; + } + + if( module ) + { + SendCommand( MSG_TO_SCH, cmd ); + } +} + diff --git a/pcbnew/edit.cpp b/pcbnew/edit.cpp index d104acd946..11c9977abe 100644 --- a/pcbnew/edit.cpp +++ b/pcbnew/edit.cpp @@ -12,80 +12,11 @@ #include "id.h" #include "protos.h" -#include "eda_dde.h" static void Process_Move_Item( WinEDA_PcbFrame* frame, EDA_BaseStruct* DrawStruct, wxDC* DC ); -// see wxstruct.h -/**************************************************************************/ -void WinEDA_PcbFrame::SendMessageToEESCHEMA( BOARD_ITEM* objectToSync ) -/**************************************************************************/ -/** Send a remote command to eeschema via a socket, - * @param objectToSync = item to be located on schematic (module, pin or text) - * Commands are - * $PART: "reference" put cursor on component anchor - * $PART: "reference" $PAD: "pad number" put cursor on the component pin - * $PART: "reference" $REF: "reference" put cursor on the component ref - * $PART: "reference" $VAL: "value" put cursor on the component value - */ -{ - char cmd[1024]; - const char* text_key; - MODULE* module = NULL; - D_PAD* pad; - TEXTE_MODULE* text_mod; - wxString msg; - - if( objectToSync == NULL ) - return; - - switch( objectToSync->Type() ) - { - case TYPEMODULE: - module = (MODULE*) objectToSync; - sprintf( cmd, "$PART: \"%s\"", - CONV_TO_UTF8( module->m_Reference->m_Text ) ); - break; - - case TYPEPAD: - module = (MODULE*) objectToSync->m_Parent; - pad = (D_PAD*) objectToSync; - msg = pad->ReturnStringPadName(); - sprintf( cmd, "$PART: \"%s\" $PAD: \"%s\"", - CONV_TO_UTF8( module->m_Reference->m_Text ), - CONV_TO_UTF8( msg ) ); - break; - - case TYPETEXTEMODULE: - #define REFERENCE 0 - #define VALUE 1 - module = (MODULE*) objectToSync->m_Parent; - text_mod = (TEXTE_MODULE*) objectToSync; - if( text_mod->m_Type == REFERENCE ) - text_key = "$REF:"; - else if( text_mod->m_Type == VALUE ) - text_key = "$VAL:"; - else - break; - - sprintf( cmd, "$PART: \"%s\" %s \"%s\"", - CONV_TO_UTF8( module->m_Reference->m_Text ), - text_key, - CONV_TO_UTF8( text_mod->m_Text ) ); - break; - - default: - break; - } - - if( module ) - { - SendCommand( MSG_TO_SCH, cmd ); - } -} - /*********************************************************************/ void WinEDA_PcbFrame::Process_Special_Functions( wxCommandEvent& event ) diff --git a/pcbnew/editrack-part2.cpp b/pcbnew/editrack-part2.cpp index c82b78692e..b3f7e890ef 100644 --- a/pcbnew/editrack-part2.cpp +++ b/pcbnew/editrack-part2.cpp @@ -243,7 +243,7 @@ void WinEDA_PcbFrame::Other_Layer_Route( TRACK* track, wxDC* DC ) Via->SetLayerPair( old_layer, GetScreen()->m_Active_Layer ); } - else // @todo: why have this override behaviour? why does the user even need to tell us what kind of via, when we know which two layers are in play? + else { // Usual via is from copper to component; layer pair is 0 and 0x0F. Via->SetLayerPair( LAYER_CUIVRE_N, LAYER_CMP_N ); diff --git a/pcbnew/makefile.include b/pcbnew/makefile.include index 176e1965a8..c1b76f3ce4 100644 --- a/pcbnew/makefile.include +++ b/pcbnew/makefile.include @@ -13,6 +13,7 @@ OBJECTS= $(TARGET).o classpcb.o\ onrightclick.o\ onleftclick.o\ modedit_onclick.o\ + cross-probing.o\ via_edit.o\ wxprint.o \ cursors.o\ diff --git a/pcbnew/win_eda_cleaningoptionsframe.cpp.notused b/pcbnew/win_eda_cleaningoptionsframe.cpp.notused deleted file mode 100644 index 3549b0dd1d..0000000000 --- a/pcbnew/win_eda_cleaningoptionsframe.cpp.notused +++ /dev/null @@ -1,220 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: win_eda_cleaningoptionsframe.cpp -// Purpose: -// Author: jean-pierre Charras -// Modified by: -// Created: 25/05/2007 13:39:29 -// RCS-ID: -// Copyright: GNU License -// Licence: -///////////////////////////////////////////////////////////////////////////// - -// Generated by DialogBlocks (unregistered), 25/05/2007 13:39:29 - -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "win_eda_cleaningoptionsframe.h" -#endif - -// For compilers that support precompilation, includes "wx/wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ -#pragma hdrstop -#endif - -#ifndef WX_PRECOMP -#include "wx/wx.h" -#endif - -////@begin includes -////@end includes - -#include "win_eda_cleaningoptionsframe.h" - -////@begin XPM images -////@end XPM images - - -/*! - * Win_EDA_CleaningOptionsFrame type definition - */ - -IMPLEMENT_DYNAMIC_CLASS( Win_EDA_CleaningOptionsFrame, wxDialog ) - - -/*! - * Win_EDA_CleaningOptionsFrame event table definition - */ - -BEGIN_EVENT_TABLE( Win_EDA_CleaningOptionsFrame, wxDialog ) - -////@begin Win_EDA_CleaningOptionsFrame event table entries -////@end Win_EDA_CleaningOptionsFrame event table entries - -END_EVENT_TABLE() - - -/*! - * Win_EDA_CleaningOptionsFrame constructors - */ - -Win_EDA_CleaningOptionsFrame::Win_EDA_CleaningOptionsFrame() -{ - Init(); -} - -Win_EDA_CleaningOptionsFrame::Win_EDA_CleaningOptionsFrame( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style ) -{ - Init(); - Create(parent, id, caption, pos, size, style); -} - - -/*! - * Win_EDA_CleaningOptionsFrame creator - */ - -bool Win_EDA_CleaningOptionsFrame::Create( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style ) -{ -////@begin Win_EDA_CleaningOptionsFrame creation - SetExtraStyle(wxWS_EX_BLOCK_EVENTS); - wxDialog::Create( parent, id, caption, pos, size, style ); - - CreateControls(); - if (GetSizer()) - { - GetSizer()->SetSizeHints(this); - } - Centre(); -////@end Win_EDA_CleaningOptionsFrame creation - return true; -} - - -/*! - * Win_EDA_CleaningOptionsFrame destructor - */ - -Win_EDA_CleaningOptionsFrame::~Win_EDA_CleaningOptionsFrame() -{ -////@begin Win_EDA_CleaningOptionsFrame destruction -////@end Win_EDA_CleaningOptionsFrame destruction -} - - -/*! - * Member initialisation - */ - -void Win_EDA_CleaningOptionsFrame::Init() -{ -////@begin Win_EDA_CleaningOptionsFrame member initialisation - m_CleanViasOpt = NULL; - m_MergetSegmOpt = NULL; - m_DeleteNullSegmOpt = NULL; - m_DeleteunconnectedOpt = NULL; - m_ConnectToPadsOpt = NULL; -////@end Win_EDA_CleaningOptionsFrame member initialisation -} - - -/*! - * Control creation for Win_EDA_CleaningOptionsFrame - */ - -void Win_EDA_CleaningOptionsFrame::CreateControls() -{ -////@begin Win_EDA_CleaningOptionsFrame content construction - // Generated by DialogBlocks, 25/05/2007 13:58:52 (unregistered) - - Win_EDA_CleaningOptionsFrame* itemDialog1 = this; - - wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxVERTICAL); - itemDialog1->SetSizer(itemBoxSizer2); - - wxBoxSizer* itemBoxSizer3 = new wxBoxSizer(wxHORIZONTAL); - itemBoxSizer2->Add(itemBoxSizer3, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); - - wxStaticBox* itemStaticBoxSizer4Static = new wxStaticBox(itemDialog1, wxID_ANY, _("Static")); - wxStaticBoxSizer* itemStaticBoxSizer4 = new wxStaticBoxSizer(itemStaticBoxSizer4Static, wxVERTICAL); - itemBoxSizer3->Add(itemStaticBoxSizer4, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); - - m_CleanViasOpt = new wxCheckBox( itemDialog1, ID_CHECKBOX_CLEAN_VIAS, _("Delete redundant vias"), wxDefaultPosition, wxDefaultSize, 0 ); - m_CleanViasOpt->SetValue(true); - itemStaticBoxSizer4->Add(m_CleanViasOpt, 0, wxALIGN_LEFT|wxALL, 5); - - m_MergetSegmOpt = new wxCheckBox( itemDialog1, ID_CHECKBOX_MERGE_SEGMENTS, _("Merge segments"), wxDefaultPosition, wxDefaultSize, 0 ); - m_MergetSegmOpt->SetValue(true); - itemStaticBoxSizer4->Add(m_MergetSegmOpt, 0, wxALIGN_LEFT|wxALL, 5); - - m_DeleteNullSegmOpt = new wxCheckBox( itemDialog1, ID_CHECKBOX_DELETE_NULL_SEGM, _("Delete 0 lenght segments"), wxDefaultPosition, wxDefaultSize, 0 ); - m_DeleteNullSegmOpt->SetValue(true); - itemStaticBoxSizer4->Add(m_DeleteNullSegmOpt, 0, wxALIGN_LEFT|wxALL, 5); - - m_DeleteunconnectedOpt = new wxCheckBox( itemDialog1, ID_CHECKBOX1, _("Delete unconnected tracks"), wxDefaultPosition, wxDefaultSize, 0 ); - m_DeleteunconnectedOpt->SetValue(true); - itemStaticBoxSizer4->Add(m_DeleteunconnectedOpt, 0, wxALIGN_LEFT|wxALL, 5); - - m_ConnectToPadsOpt = new wxCheckBox( itemDialog1, ID_CHECKBOX, _("Connect to Pads"), wxDefaultPosition, wxDefaultSize, 0 ); - m_ConnectToPadsOpt->SetValue(false); - itemStaticBoxSizer4->Add(m_ConnectToPadsOpt, 0, wxALIGN_LEFT|wxALL, 5); - - wxStaticBox* itemStaticBoxSizer10Static = new wxStaticBox(itemDialog1, wxID_ANY, _("Static")); - wxStaticBoxSizer* itemStaticBoxSizer10 = new wxStaticBoxSizer(itemStaticBoxSizer10Static, wxVERTICAL); - itemBoxSizer3->Add(itemStaticBoxSizer10, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); - - wxButton* itemButton11 = new wxButton( itemDialog1, ID_BUTTON_EXECUTE, _("Clean pcb"), wxDefaultPosition, wxDefaultSize, 0 ); - itemButton11->SetDefault(); - itemStaticBoxSizer10->Add(itemButton11, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); - - itemBoxSizer2->Add(5, 5, 0, wxGROW|wxALL, 5); - - wxStaticText* itemStaticText13 = new wxStaticText( itemDialog1, wxID_STATIC, _("Infos:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer2->Add(itemStaticText13, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5); - - wxTextCtrl* itemTextCtrl14 = new wxTextCtrl( itemDialog1, ID_TEXTCTRL1, _T(""), wxDefaultPosition, wxSize(-1, 120), wxTE_MULTILINE ); - itemBoxSizer2->Add(itemTextCtrl14, 0, wxGROW|wxALL, 5); - - // Set validators - m_CleanViasOpt->SetValidator( wxGenericValidator(& s_CleanVias) ); - m_MergetSegmOpt->SetValidator( wxGenericValidator(& s_MergeSegments) ); - m_DeleteNullSegmOpt->SetValidator( wxGenericValidator(& s_Delete0lenSegm) ); - m_DeleteunconnectedOpt->SetValidator( wxGenericValidator(& s_DeleteUnconnectedSegm) ); -////@end Win_EDA_CleaningOptionsFrame content construction -} - - -/*! - * Should we show tooltips? - */ - -bool Win_EDA_CleaningOptionsFrame::ShowToolTips() -{ - return true; -} - -/*! - * Get bitmap resources - */ - -wxBitmap Win_EDA_CleaningOptionsFrame::GetBitmapResource( const wxString& name ) -{ - // Bitmap retrieval -////@begin Win_EDA_CleaningOptionsFrame bitmap retrieval - wxUnusedVar(name); - return wxNullBitmap; -////@end Win_EDA_CleaningOptionsFrame bitmap retrieval -} - -/*! - * Get icon resources - */ - -wxIcon Win_EDA_CleaningOptionsFrame::GetIconResource( const wxString& name ) -{ - // Icon retrieval -////@begin Win_EDA_CleaningOptionsFrame icon retrieval - wxUnusedVar(name); - return wxNullIcon; -////@end Win_EDA_CleaningOptionsFrame icon retrieval -} diff --git a/pcbnew/win_eda_cleaningoptionsframe.h.notused b/pcbnew/win_eda_cleaningoptionsframe.h.notused deleted file mode 100644 index 4e44eb63c9..0000000000 --- a/pcbnew/win_eda_cleaningoptionsframe.h.notused +++ /dev/null @@ -1,109 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: win_eda_cleaningoptionsframe.h -// Purpose: -// Author: jean-pierre Charras -// Modified by: -// Created: 25/05/2007 13:39:29 -// RCS-ID: -// Copyright: GNU License -// Licence: -///////////////////////////////////////////////////////////////////////////// - -// Generated by DialogBlocks (unregistered), 25/05/2007 13:39:29 - -#ifndef _WIN_EDA_CLEANINGOPTIONSFRAME_H_ -#define _WIN_EDA_CLEANINGOPTIONSFRAME_H_ - -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "win_eda_cleaningoptionsframe.h" -#endif - -/*! - * Includes - */ - -////@begin includes -#include "wx/valgen.h" -////@end includes - -/*! - * Forward declarations - */ - -////@begin forward declarations -////@end forward declarations - -/*! - * Control identifiers - */ - -////@begin control identifiers -#define ID_WIN_EDA_CLEANINGOPTIONSFRAME 10000 -#define ID_CHECKBOX_CLEAN_VIAS 10001 -#define ID_CHECKBOX_MERGE_SEGMENTS 10003 -#define ID_CHECKBOX_DELETE_NULL_SEGM 10002 -#define ID_CHECKBOX1 10005 -#define ID_CHECKBOX 10004 -#define ID_BUTTON_EXECUTE 10006 -#define ID_TEXTCTRL1 10007 -#define SYMBOL_WIN_EDA_CLEANINGOPTIONSFRAME_STYLE wxCAPTION|wxRESIZE_BORDER|wxSYSTEM_MENU|wxCLOSE_BOX -#define SYMBOL_WIN_EDA_CLEANINGOPTIONSFRAME_TITLE _("Cleaning options") -#define SYMBOL_WIN_EDA_CLEANINGOPTIONSFRAME_IDNAME ID_WIN_EDA_CLEANINGOPTIONSFRAME -#define SYMBOL_WIN_EDA_CLEANINGOPTIONSFRAME_SIZE wxSize(400, 300) -#define SYMBOL_WIN_EDA_CLEANINGOPTIONSFRAME_POSITION wxDefaultPosition -////@end control identifiers - - -/*! - * Win_EDA_CleaningOptionsFrame class declaration - */ - -class Win_EDA_CleaningOptionsFrame: public wxDialog -{ - DECLARE_DYNAMIC_CLASS( Win_EDA_CleaningOptionsFrame ) - DECLARE_EVENT_TABLE() - -public: - /// Constructors - Win_EDA_CleaningOptionsFrame(); - Win_EDA_CleaningOptionsFrame( wxWindow* parent, wxWindowID id = SYMBOL_WIN_EDA_CLEANINGOPTIONSFRAME_IDNAME, const wxString& caption = SYMBOL_WIN_EDA_CLEANINGOPTIONSFRAME_TITLE, const wxPoint& pos = SYMBOL_WIN_EDA_CLEANINGOPTIONSFRAME_POSITION, const wxSize& size = SYMBOL_WIN_EDA_CLEANINGOPTIONSFRAME_SIZE, long style = SYMBOL_WIN_EDA_CLEANINGOPTIONSFRAME_STYLE ); - - /// Creation - bool Create( wxWindow* parent, wxWindowID id = SYMBOL_WIN_EDA_CLEANINGOPTIONSFRAME_IDNAME, const wxString& caption = SYMBOL_WIN_EDA_CLEANINGOPTIONSFRAME_TITLE, const wxPoint& pos = SYMBOL_WIN_EDA_CLEANINGOPTIONSFRAME_POSITION, const wxSize& size = SYMBOL_WIN_EDA_CLEANINGOPTIONSFRAME_SIZE, long style = SYMBOL_WIN_EDA_CLEANINGOPTIONSFRAME_STYLE ); - - /// Destructor - ~Win_EDA_CleaningOptionsFrame(); - - /// Initialises member variables - void Init(); - - /// Creates the controls and sizers - void CreateControls(); - -////@begin Win_EDA_CleaningOptionsFrame event handler declarations - -////@end Win_EDA_CleaningOptionsFrame event handler declarations - -////@begin Win_EDA_CleaningOptionsFrame member function declarations - - /// Retrieves bitmap resources - wxBitmap GetBitmapResource( const wxString& name ); - - /// Retrieves icon resources - wxIcon GetIconResource( const wxString& name ); -////@end Win_EDA_CleaningOptionsFrame member function declarations - - /// Should we show tooltips? - static bool ShowToolTips(); - -////@begin Win_EDA_CleaningOptionsFrame member variables - wxCheckBox* m_CleanViasOpt; - wxCheckBox* m_MergetSegmOpt; - wxCheckBox* m_DeleteNullSegmOpt; - wxCheckBox* m_DeleteunconnectedOpt; - wxCheckBox* m_ConnectToPadsOpt; -////@end Win_EDA_CleaningOptionsFrame member variables -}; - -#endif - // _WIN_EDA_CLEANINGOPTIONSFRAME_H_ diff --git a/share/drawpanel.cpp b/share/drawpanel.cpp index d7ed7386f0..36e3edf713 100644 --- a/share/drawpanel.cpp +++ b/share/drawpanel.cpp @@ -1,6 +1,6 @@ -/******************************************************************/ -/* drawpanel.cpp - fonctions des classes du type WinEDA_DrawPanel */ -/******************************************************************/ +/******************************************/ +/* drawpanel.cpp - WinEDA_DrawPanel class */ +/******************************************/ #ifdef __GNUG__ @@ -14,9 +14,7 @@ #include "id.h" // defines locaux -#define CURSOR_SIZE 12 // taille de la croix du curseur PCB - -// Variables locales +#define CURSOR_SIZE 12 // Cursor size in pixels // table des evenements captes par un WinEDA_DrawPanel BEGIN_EVENT_TABLE( WinEDA_DrawPanel, EDA_DRAW_PANEL ) @@ -76,7 +74,7 @@ void WinEDA_DrawPanel::Trace_Curseur( wxDC* DC, int color ) /*********************************************************************************/ /* - * Trace Le curseur sur la zone PCB , se deplacant sur la grille + * Draw the schematic cursor which is usually on grid */ { if( m_CursorLevel != 0 ) @@ -84,11 +82,11 @@ void WinEDA_DrawPanel::Trace_Curseur( wxDC* DC, int color ) return; } - wxPoint Cursor = GetScreen()->m_Curseur; - if( DC == NULL ) return; + wxPoint Cursor = GetScreen()->m_Curseur; + GRSetDrawMode( DC, GR_XOR ); if( g_CursorShape == 1 ) /* Trace d'un reticule */ { @@ -301,7 +299,7 @@ wxPoint WinEDA_DrawPanel::GetScreenCenterRealPosition() void WinEDA_DrawPanel::MouseToCursorSchema() /**********************************************/ -/* place le curseur souris sur la position du curseur schema +/* Move the mouse cursor to the current schematic cursor */ { wxPoint Mouse = CursorScreenPosition(); @@ -314,7 +312,8 @@ void WinEDA_DrawPanel::MouseToCursorSchema() void WinEDA_DrawPanel::MouseTo( const wxPoint& Mouse ) /****************************************************/ -/* place le curseur souris sur la position Mouse +/** Move the mouse cursor to the position "Mouse" + * @param Mouse = new mouse cursor position */ { wxPoint mouse; @@ -334,7 +333,7 @@ void WinEDA_DrawPanel::MouseTo( const wxPoint& Mouse ) void WinEDA_DrawPanel::OnActivate( wxActivateEvent& event ) /********************************************************/ { - m_CanStartBlock = -1; // Commande block can't start + m_CanStartBlock = -1; // Block Command can't start event.Skip(); } @@ -356,7 +355,7 @@ void WinEDA_DrawPanel::OnScroll( wxScrollWinEvent& event ) int x, y; GetViewStart( &x, &y ); - dir = event.GetOrientation(); // wxHORIZONTAL ou wxVERTICAL + dir = event.GetOrientation(); // wxHORIZONTAL or wxVERTICAL if( id == wxEVT_SCROLLWIN_LINEUP ) value = -m_ScrollButt_unit; @@ -641,19 +640,19 @@ void WinEDA_DrawPanel::DrawBackGround( wxDC* DC ) } } - /* trace des axes principaux */ + /* Draw axis */ if( m_Parent->m_Draw_Axis ) { - /* Trace de l'axe vertical */ + /* Draw the Y axis */ GRDashedLine( &m_ClipBox, DC, 0, -screen->ReturnPageSize().y, 0, screen->ReturnPageSize().y, 0, Color ); - /* Trace de l'axe horizontal */ + /* Draw the X axis */ GRDashedLine( &m_ClipBox, DC, -screen->ReturnPageSize().x, 0, screen->ReturnPageSize().x, 0, 0, Color ); } - /* trace des axes auxiliaires */ + /* Draw auxiliary axis */ if( m_Parent->m_Draw_Auxiliary_Axis ) { m_Draw_Auxiliary_Axis( DC, FALSE ); @@ -674,13 +673,13 @@ void WinEDA_DrawPanel::m_Draw_Auxiliary_Axis( wxDC* DC, int drawmode ) GRSetDrawMode( DC, drawmode ); - /* Trace de l'axe vertical */ + /* Draw the Y axis */ GRDashedLine( &m_ClipBox, DC, m_Parent->m_Auxiliary_Axis_Position.x, -screen->ReturnPageSize().y, m_Parent->m_Auxiliary_Axis_Position.x, screen->ReturnPageSize().y, 0, Color ); - /* Trace de l'axe horizontal */ + /* Draw the X axis */ GRDashedLine( &m_ClipBox, DC, -screen->ReturnPageSize().x, m_Parent->m_Auxiliary_Axis_Position.y, screen->ReturnPageSize().x, m_Parent->m_Auxiliary_Axis_Position.y, @@ -692,8 +691,7 @@ void WinEDA_DrawPanel::m_Draw_Auxiliary_Axis( wxDC* DC, int drawmode ) void WinEDA_DrawPanel::OnRightClick( wxMouseEvent& event ) /*******************************************************/ -/* Construit et affiche un menu Popup lorsque on actionne le bouton droit - * de la souris +/* Build and display a Popup menu on a right mouse button click */ { wxPoint pos;