diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 15fd518d4b..5f9d242ae7 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -4,6 +4,17 @@ KiCad ChangeLog 2010 Please add newer entries at the top, list the date and your name with email address. +2010-Jan-24 UPDATE Jean-Pierre Charras +================================================================================ +++ Pcbnew: + in variable names, change non existent word Hight to High + Remove redundant tool in left toolbar (option toolbar) + (this option is now in layers manager) + Show layers in horizontal combo box in same order as in layer manager. + +++all: + minor code cleaning. + 2010-Jan-23 UPDATE Dick Hollenbeck ================================================================================ ++pcbnew's PCB_LAYER_WIDGET diff --git a/bitmaps/CMakeLists.txt b/bitmaps/CMakeLists.txt index 4e7df1b0d5..b7bfbedf71 100644 --- a/bitmaps/CMakeLists.txt +++ b/bitmaps/CMakeLists.txt @@ -247,7 +247,6 @@ set(BITMAP_SRCS mw_Add_Stub.xpm mw_toolbar.xpm Net_HighLight.xpm - net_hightlight.xpm netlist.xpm Net_Locked.xpm Net_UnLocked.xpm diff --git a/bitmaps/net_hightlight.xpm b/bitmaps/net_hightlight.xpm deleted file mode 100644 index 710a755c27..0000000000 --- a/bitmaps/net_hightlight.xpm +++ /dev/null @@ -1,30 +0,0 @@ -/* XPM */ -#ifndef XPMMAIN -extern const char* net_hightlight_xpm[]; -#else -const char *net_hightlight_xpm[] = { -/* columns rows colors const chars-per-pixel */ -"16 16 3 1", -"- c #008000", -". c #00FF00", -"X c None", -/* pixels */ -"XXXXXXXXXXXXXXXX", -"XXXXXX-XXXXXXXXX", -"XXXXXX-XXXXXXXXX", -"XXXXXX-XXXXXXXXX", -"XXXXXX-XXXXXXXXX", -"XXXXX...XXXXXXXX", -"XXXX.....XXXXXXX", -"----.....------X", -"XXXX.....XXXXXXX", -"XXXXX...XXXXXXXX", -"XXXXXX-XXXXXXXXX", -"XXXXXX-XXXXXXXXX", -"XXXXXX-XXXXXXXXX", -"XXXXXX-XXXXXXXXX", -"XXXXXX-XXXXXXXXX", -"XXXXXXXXXXXXXXXX" -}; - -#endif diff --git a/eeschema/tool_viewlib.cpp b/eeschema/tool_viewlib.cpp index b5fd15d852..16af7cc54e 100644 --- a/eeschema/tool_viewlib.cpp +++ b/eeschema/tool_viewlib.cpp @@ -157,6 +157,8 @@ void WinEDA_ViewlibFrame::ReCreateHToolbar() m_HToolBar->EnableTool( ID_LIBVIEW_VIEWDOC, entry && ( entry->GetDocFileName() != wxEmptyString ) ); + + m_HToolBar->Refresh(); } diff --git a/gerbview/edit.cpp b/gerbview/edit.cpp index 461dbd596d..4b052c8349 100644 --- a/gerbview/edit.cpp +++ b/gerbview/edit.cpp @@ -13,6 +13,7 @@ #include "pcbplot.h" #include "protos.h" #include "kicad_device_context.h" +#include "gerbview_id.h" /* Process the command triggered by the left button of the mouse when a tool diff --git a/gerbview/gerberframe.cpp b/gerbview/gerberframe.cpp index cc7a8477f7..739e965edc 100644 --- a/gerbview/gerberframe.cpp +++ b/gerbview/gerberframe.cpp @@ -16,6 +16,7 @@ #include "pcbplot.h" #include "bitmaps.h" #include "protos.h" +#include "gerbview_id.h" /****************************************/ @@ -87,7 +88,6 @@ BEGIN_EVENT_TABLE( WinEDA_GerberFrame, WinEDA_BasePcbFrame ) EVT_TOOL( wxID_UNDO, WinEDA_GerberFrame::Process_Special_Functions ) EVT_TOOL( ID_GEN_PRINT, WinEDA_GerberFrame::ToPrinter ) EVT_TOOL( ID_FIND_ITEMS, WinEDA_GerberFrame::Process_Special_Functions ) - EVT_TOOL( ID_DRC_CONTROL, WinEDA_GerberFrame::Process_Special_Functions ) EVT_KICAD_CHOICEBOX( ID_TOOLBARH_PCB_SELECT_LAYER, WinEDA_GerberFrame::Process_Special_Functions ) @@ -96,8 +96,6 @@ BEGIN_EVENT_TABLE( WinEDA_GerberFrame, WinEDA_BasePcbFrame ) // Vertical toolbar: EVT_TOOL( ID_NO_SELECT_BUTT, WinEDA_GerberFrame::Process_Special_Functions ) - EVT_TOOL( ID_TRACK_BUTT, WinEDA_GerberFrame::Process_Special_Functions ) - EVT_TOOL( ID_PCB_ZONES_BUTT, WinEDA_GerberFrame::Process_Special_Functions ) EVT_TOOL( ID_PCB_DELETE_ITEM_BUTT, WinEDA_GerberFrame::Process_Special_Functions ) diff --git a/gerbview/gerbview_id.h b/gerbview/gerbview_id.h new file mode 100644 index 0000000000..2d0dccc93a --- /dev/null +++ b/gerbview/gerbview_id.h @@ -0,0 +1,25 @@ +#ifndef __GERBVIEW_ID_H__ +#define __GERBVIEW_ID_H__ + +#include "id.h" + +/** + * Command IDs for the printed circuit board editor. + * + * Please add IDs that are unique to the printed circuit board editor (PCBNew) + * here and not in the global id.h file. This will prevent the entire project + * from being rebuilt when adding new commands to the PCBNew. + */ + +enum gerbview_ids +{ + ID_MAIN_MENUBAR = ID_END_LIST, + + ID_TOOLBARH_PCB_SELECT_LAYER, + ID_PCB_DELETE_ITEM_BUTT, + ID_PCB_GLOBAL_DELETE, + ID_POPUP_PCB_DELETE_TRACKSEG, + ID_PCB_DISPLAY_OPTIONS_SETUP +}; + +#endif /* __GERBVIEW_IDS_H__ */ diff --git a/gerbview/tool_gerber.cpp b/gerbview/tool_gerber.cpp index b19a186bff..121e6b5816 100644 --- a/gerbview/tool_gerber.cpp +++ b/gerbview/tool_gerber.cpp @@ -10,6 +10,7 @@ #include "pcbplot.h" #include "protos.h" #include "bitmaps.h" +#include "gerbview_id.h" #include "hotkeys.h" diff --git a/include/bitmaps.h b/include/bitmaps.h index 067bebc1b9..11173fc5dd 100644 --- a/include/bitmaps.h +++ b/include/bitmaps.h @@ -238,7 +238,6 @@ extern const char* mw_Add_stub_arc_xpm[]; extern const char* mw_Add_Stub_xpm[]; extern const char* mw_toolbar_xpm[]; extern const char* net_highlight_xpm[]; -extern const char* net_hightlight_xpm[]; extern const char* netlist_xpm[]; extern const char* net_locked_xpm[]; extern const char* net_unlocked_xpm[]; diff --git a/include/id.h b/include/id.h index 384822439b..c48f7f6741 100644 --- a/include/id.h +++ b/include/id.h @@ -235,19 +235,8 @@ enum main_id ID_TB_OPTIONS_SHOW_HIGH_CONTRAST_MODE, ID_TB_OPTIONS_SHOW_EXTRA_VERTICAL_TOOLBAR1, ID_TB_OPTIONS_SHOW_POLYGONS_SKETCH, - ID_TB_OPTIONS_SHOW_INVISIBLE_TEXT_MODE, - ID_TB_OPTIONS_END, - ID_DRC_CONTROL, - ID_PCB_GLOBAL_DELETE, - ID_TRACK_BUTT, - ID_PCB_ZONES_BUTT, - ID_PCB_DELETE_ITEM_BUTT, - ID_POPUP_PCB_DELETE_TRACKSEG, - ID_TOOLBARH_PCB_SELECT_LAYER, - ID_PCB_DISPLAY_OPTIONS_SETUP, - ID_END_LIST }; diff --git a/include/wxPcbStruct.h b/include/wxPcbStruct.h index 9c0170c32c..747ef5c379 100644 --- a/include/wxPcbStruct.h +++ b/include/wxPcbStruct.h @@ -505,7 +505,7 @@ public: // Highlight functions: int Select_High_Light( wxDC* DC ); - void Hight_Light( wxDC* DC ); + void High_Light( wxDC* DC ); // Track and via edition: void Via_Edit_Control( wxCommandEvent& event ); diff --git a/internat/fr/kicad.mo b/internat/fr/kicad.mo index c8f5ba99e7..9e9a025f55 100644 Binary files a/internat/fr/kicad.mo and b/internat/fr/kicad.mo differ diff --git a/internat/fr/kicad.po b/internat/fr/kicad.po index 953b0fb439..ac5cbbb47e 100644 --- a/internat/fr/kicad.po +++ b/internat/fr/kicad.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: kicad\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-22 14:07+0100\n" -"PO-Revision-Date: 2010-01-22 14:08+0100\n" +"POT-Creation-Date: 2010-01-23 17:26+0100\n" +"PO-Revision-Date: 2010-01-23 17:28+0100\n" "Last-Translator: \n" "Language-Team: kicad team \n" "MIME-Version: 1.0\n" @@ -747,12 +747,12 @@ msgstr "X Pos" msgid "Y pos" msgstr "Y pos" -#: pcbnew/hotkeys.cpp:608 +#: pcbnew/hotkeys.cpp:595 #, c-format msgid "Footprint %s found, but locked" msgstr "Module %s trouvé, mais verrouillé" -#: pcbnew/hotkeys.cpp:802 +#: pcbnew/hotkeys.cpp:789 msgid "Delete module?" msgstr "Effacer Module?" @@ -2063,6 +2063,10 @@ msgstr "Modules Dessous" msgid "Show footprints that are on board's back" msgstr "Afficher les modules situés sur le dessous du ciruit imprimé" +#: pcbnew/pcbframe.cpp:330 +msgid "Visibles" +msgstr "Visibles" + #: pcbnew/pcbframe.cpp:497 msgid "Front copper layer" msgstr "Couche cuivre dessus" @@ -2075,71 +2079,71 @@ msgstr "Couche interne" msgid "Back copper layer" msgstr "Couche cuivre dessous" -#: pcbnew/pcbframe.cpp:523 +#: pcbnew/pcbframe.cpp:533 msgid "Adhesive on board's front" msgstr "Afficher couche adhésive situés sur le dessus du ciruit imprimé" -#: pcbnew/pcbframe.cpp:524 +#: pcbnew/pcbframe.cpp:534 msgid "Adhesive on board's back" msgstr "Couche adhésive sur le dessous du circuit imprimé" -#: pcbnew/pcbframe.cpp:525 +#: pcbnew/pcbframe.cpp:535 msgid "Solder paste on board's front" msgstr "Couche de pâte à souder sur dessus du circuit imprimé" -#: pcbnew/pcbframe.cpp:526 +#: pcbnew/pcbframe.cpp:536 msgid "Solder paste on board's back" msgstr "Couche de pate à souder sur dessous du circuit imprimé" -#: pcbnew/pcbframe.cpp:527 +#: pcbnew/pcbframe.cpp:537 msgid "Silkscreen on board's front" msgstr "Sérigraphie sur le dessus du ciruit imprimé" -#: pcbnew/pcbframe.cpp:528 +#: pcbnew/pcbframe.cpp:538 msgid "Silkscreen on board's back" msgstr "Sérigraphie sur le dessous du ciruit imprimé " -#: pcbnew/pcbframe.cpp:529 +#: pcbnew/pcbframe.cpp:539 msgid "Solder mask on board's front" msgstr "Couche masque soudure sur le dessus du ciruit imprimée" -#: pcbnew/pcbframe.cpp:530 +#: pcbnew/pcbframe.cpp:540 msgid "Solder mask on board's back" msgstr "Couche masque soudure sur le dessous du ciruit imprimée" -#: pcbnew/pcbframe.cpp:531 +#: pcbnew/pcbframe.cpp:541 msgid "Explanatory drawings" msgstr "Couche dessins explicatifs" -#: pcbnew/pcbframe.cpp:532 +#: pcbnew/pcbframe.cpp:542 msgid "Explanatory comments" msgstr "Couche commentaires" -#: pcbnew/pcbframe.cpp:533 +#: pcbnew/pcbframe.cpp:543 msgid "TDB" msgstr "" -#: pcbnew/pcbframe.cpp:534 +#: pcbnew/pcbframe.cpp:544 msgid "TBD" msgstr "" -#: pcbnew/pcbframe.cpp:535 +#: pcbnew/pcbframe.cpp:545 msgid "Board's perimeter definition" msgstr "Couche de définition des contours du circuit imprimé" -#: pcbnew/pcbframe.cpp:579 +#: pcbnew/pcbframe.cpp:589 msgid "Board modified, Save before exit ?" msgstr "Circuit Imprimé modifié, Sauver avant de quitter ?" -#: pcbnew/pcbframe.cpp:580 +#: pcbnew/pcbframe.cpp:590 msgid "Confirmation" msgstr "Confirmation" -#: pcbnew/pcbframe.cpp:619 +#: pcbnew/pcbframe.cpp:629 msgid "3D Frame already opened" msgstr "Fenêtre 3D déjà ouverte" -#: pcbnew/pcbframe.cpp:623 +#: pcbnew/pcbframe.cpp:633 msgid "3D Viewer" msgstr "Visu 3D" @@ -2155,14 +2159,6 @@ msgstr "Nb Segms" msgid "Error: Unexpected end of file !" msgstr "Erreur: Fin de fichier inattendue !" -#: pcbnew/layer_panel_base.cpp:36 -msgid "Layers" -msgstr "Couches" - -#: pcbnew/layer_panel_base.cpp:55 -msgid "Rendering" -msgstr "Aspect" - #: pcbnew/pcbplot.cpp:558 msgid "Warning: Scale option set to a very small value" msgstr "Attention: option d'échelle ajustée à une valeur très petite" @@ -2320,26 +2316,6 @@ msgstr "Pour une liste de pads non connecté, clic droit pour ouvrir un menu" msgid "Unconnected" msgstr "Non connecté" -#: pcbnew/layer_widget.cpp:251 -msgid "Show All Cu" -msgstr "Afficher toutes couches cuivre" - -#: pcbnew/layer_widget.cpp:254 -msgid "Hide All Cu" -msgstr "Cacher Cu" - -#: pcbnew/layer_widget.cpp:398 -msgid "Left click to select, middle click for color change, right click for menu" -msgstr "Cliquer sur bouton gauche pour selectionner, du milieu pour changer la couleur, droit pour le menu" - -#: pcbnew/layer_widget.cpp:414 -msgid "Enable this for visibility" -msgstr "Activer ceci pour activer la visibilité" - -#: pcbnew/layer_widget.cpp:433 -msgid "Middle click for color change" -msgstr "Clicquer sur bouton du milieu pour changer la couleur" - #: pcbnew/moduleframe.cpp:251 msgid "Module Editor: Module modified! Continue?" msgstr "Editeur de Module: Module modifié! Continuer ?" @@ -2970,7 +2946,6 @@ msgid "Error : Zone clearance is set to an unreasonnable value" msgstr "Erreur: l'isolation de zone est réglée à une valeur déraisonnable." #: pcbnew/dialog_copper_zones.cpp:292 -#: pcbnew/zones_non_copper_type_functions.cpp:142 msgid "" "Error :\n" "you must choose a copper min thickness value bigger than 0.001 inch (or 0.0254 mm)" @@ -2987,7 +2962,6 @@ msgstr "" "vous devez choisir une valeur pour l'épaisseur de cuivre dans les freins thermiques plus grande que l'épaisseur de cuivre minimum des zones" #: pcbnew/dialog_copper_zones.cpp:329 -#: pcbnew/zones_non_copper_type_functions.cpp:178 msgid "Error : you must choose a layer" msgstr "Erreur: Vous devez choisir une couche" @@ -3236,6 +3210,7 @@ msgid "Warning: The Top Layer and Bottom Layer are same." msgstr "Attention: Les couches dessus et dessous sont les mêmes" #: pcbnew/class_board_item.cpp:25 +#: pcbnew/class_drawsegment.cpp:381 msgid "Arc" msgstr "Arc" @@ -3767,6 +3742,7 @@ msgid "Preview" msgstr "Prévisualisation" #: pcbnew/dialog_print_using_printer_base.cpp:134 +#: pcbnew/dialog_print_using_printer.cpp:500 msgid "Print" msgstr "Imprimer" @@ -4929,6 +4905,7 @@ msgid "Save DRC Report File" msgstr "Sauver Fichier Rapport DRC:" #: pcbnew/dialog_edit_module_for_BoardEditor_base.cpp:24 +#: pcbnew/dialog_edit_module_for_Modedit_base.cpp:24 msgid "Fields:" msgstr "Champs:" @@ -4973,50 +4950,62 @@ msgid "Change Module(s)" msgstr "Change module(s)" #: pcbnew/dialog_edit_module_for_BoardEditor_base.cpp:101 +#: pcbnew/dialog_edit_module_for_Modedit_base.cpp:72 msgid "Normal+Insert" msgstr "Normal+Insert" #: pcbnew/dialog_edit_module_for_BoardEditor_base.cpp:101 +#: pcbnew/dialog_edit_module_for_Modedit_base.cpp:72 msgid "Virtual" msgstr "Virtuel" #: pcbnew/dialog_edit_module_for_BoardEditor_base.cpp:103 +#: pcbnew/dialog_edit_module_for_Modedit_base.cpp:74 msgid "Attributs:" msgstr "Attributs:" #: pcbnew/dialog_edit_module_for_BoardEditor_base.cpp:107 +#: pcbnew/dialog_edit_module_for_Modedit_base.cpp:78 msgid "Free" msgstr "Libre" #: pcbnew/dialog_edit_module_for_BoardEditor_base.cpp:107 +#: pcbnew/dialog_edit_module_for_Modedit_base.cpp:78 msgid "Locked" msgstr "Verrouillé" #: pcbnew/dialog_edit_module_for_BoardEditor_base.cpp:109 +#: pcbnew/dialog_edit_module_for_Modedit_base.cpp:80 msgid "Move and Auto Place" msgstr "Déplacement et Placement Automatique" #: pcbnew/dialog_edit_module_for_BoardEditor_base.cpp:114 +#: pcbnew/dialog_edit_module_for_Modedit_base.cpp:85 msgid "Auto Move and Place" msgstr "Move et Place Automatiques" #: pcbnew/dialog_edit_module_for_BoardEditor_base.cpp:119 +#: pcbnew/dialog_edit_module_for_Modedit_base.cpp:90 msgid "Rotation 90 degree" msgstr "Rotation 90 degrés" #: pcbnew/dialog_edit_module_for_BoardEditor_base.cpp:131 +#: pcbnew/dialog_edit_module_for_Modedit_base.cpp:102 msgid "Rotation 180 degree" msgstr "Rotation 180 degrés" #: pcbnew/dialog_edit_module_for_BoardEditor_base.cpp:143 +#: pcbnew/dialog_edit_module_for_Modedit_base.cpp:114 msgid "Masks clearances local values:" msgstr "Valeurs locales pour marges sur masques:" #: pcbnew/dialog_edit_module_for_BoardEditor_base.cpp:145 +#: pcbnew/dialog_edit_module_for_Modedit_base.cpp:116 msgid "Set these values to 0 to use global values" msgstr "Mettre ces valeurs à 0 pour utiliser les valeurs globales" #: pcbnew/dialog_edit_module_for_BoardEditor_base.cpp:156 +#: pcbnew/dialog_edit_module_for_Modedit_base.cpp:127 msgid "All pads nets clearance" msgstr "Isolation pour tous les pads" @@ -5031,6 +5020,7 @@ msgstr "" "Cette valeur peut être remplacée par une valeur locale d'un pad" #: pcbnew/dialog_edit_module_for_BoardEditor_base.cpp:180 +#: pcbnew/dialog_edit_module_for_Modedit_base.cpp:149 msgid "" "This is the local clearance between pads and the solder mask\n" "for this footprint\n" @@ -5043,6 +5033,7 @@ msgstr "" "Si 0, la valeur globale sera utilisée" #: pcbnew/dialog_edit_module_for_BoardEditor_base.cpp:193 +#: pcbnew/dialog_edit_module_for_Modedit_base.cpp:162 msgid "" "This is the local clearance between pads and the solder paste\n" "for this footprint.\n" @@ -5057,6 +5048,7 @@ msgstr "" "Une valeur négative signifie que le masque est plus petit que le pad" #: pcbnew/dialog_edit_module_for_BoardEditor_base.cpp:206 +#: pcbnew/dialog_edit_module_for_Modedit_base.cpp:175 msgid "" "This is the local clearance ratio in per cent between pads and the solder paste\n" "for this footprint.\n" @@ -5073,30 +5065,37 @@ msgstr "" "Une valeur négative signifie que le masque est plus petit que le pad." #: pcbnew/dialog_edit_module_for_BoardEditor_base.cpp:226 +#: pcbnew/dialog_edit_module_for_Modedit_base.cpp:195 msgid "Properties" msgstr "Propriétés" #: pcbnew/dialog_edit_module_for_BoardEditor_base.cpp:231 +#: pcbnew/dialog_edit_module_for_Modedit_base.cpp:200 msgid "3D Shape Name" msgstr "3D forme" #: pcbnew/dialog_edit_module_for_BoardEditor_base.cpp:241 +#: pcbnew/dialog_edit_module_for_Modedit_base.cpp:210 msgid "3D Scale and Pos" msgstr "Echelle et Position 3D" #: pcbnew/dialog_edit_module_for_BoardEditor_base.cpp:248 +#: pcbnew/dialog_edit_module_for_Modedit_base.cpp:217 msgid "Browse Shapes" msgstr "Examen Fichiers de Formes" #: pcbnew/dialog_edit_module_for_BoardEditor_base.cpp:251 +#: pcbnew/dialog_edit_module_for_Modedit_base.cpp:220 msgid "Add 3D Shape" msgstr "Ajout Forme 3D" #: pcbnew/dialog_edit_module_for_BoardEditor_base.cpp:254 +#: pcbnew/dialog_edit_module_for_Modedit_base.cpp:223 msgid "Remove 3D Shape" msgstr "Suppr. Forme 3D:" #: pcbnew/dialog_edit_module_for_BoardEditor_base.cpp:264 +#: pcbnew/dialog_edit_module_for_Modedit_base.cpp:233 msgid "3D settings" msgstr "3D Caract" @@ -5386,6 +5385,10 @@ msgstr "14" msgid "16" msgstr "16" +#: pcbnew/dialog_layers_setup_base.cpp:47 +msgid "Layers" +msgstr "Couches" + #: pcbnew/dialog_layers_setup_base.cpp:68 msgid "Adhes_Front_later" msgstr "Adhes_Dessus_réserve" @@ -5711,7 +5714,6 @@ msgstr "Pistes et vias:" #: pcbnew/dialog_display_options_base.cpp:73 #: pcbnew/dialog_display_options_base.cpp:84 #: pcbnew/dialog_display_options_base.cpp:118 -#: pcbnew/dialog_plot_base.cpp:97 msgid "Sketch" msgstr "Contour" @@ -5720,7 +5722,6 @@ msgstr "Contour" #: pcbnew/dialog_display_options_base.cpp:73 #: pcbnew/dialog_display_options_base.cpp:84 #: pcbnew/dialog_display_options_base.cpp:118 -#: pcbnew/dialog_plot_base.cpp:97 msgid "Filled" msgstr "Plein" @@ -5734,8 +5735,6 @@ msgstr "Sélectionner comment les pistes sont affichées" #: pcbnew/dialog_display_options_base.cpp:30 #: pcbnew/dialog_display_options_base.cpp:38 -#: pcbnew/dialog_general_options_BoardEditor_base.cpp:137 -#: pcbnew/dialog_general_options_BoardEditor_base.cpp:145 msgid "Never" msgstr "Jamais" @@ -5749,8 +5748,6 @@ msgstr "Nouvelle piste avec via" #: pcbnew/dialog_display_options_base.cpp:30 #: pcbnew/dialog_display_options_base.cpp:38 -#: pcbnew/dialog_general_options_BoardEditor_base.cpp:137 -#: pcbnew/dialog_general_options_BoardEditor_base.cpp:145 msgid "Always" msgstr "Toujours" @@ -5921,85 +5918,454 @@ msgstr "Fichier placement côté cuivre:" msgid "Module count" msgstr "Nb Modules" -#: pcbnew/class_board.cpp:52 -msgid "This is the default net class." -msgstr "Ceci est la Netclass par défaut" +#: pcbnew/menubar_pcbframe.cpp:39 +msgid "&New\tCtrl+N" +msgstr "&Nouveau\tCtrl+N" -#: pcbnew/class_board.cpp:212 -msgid "Front" -msgstr "Dessus" +#: pcbnew/menubar_pcbframe.cpp:40 +msgid "Clear current board and initialize a new one" +msgstr "Effacer l'ancien C.I. et initialiser un nouveau" -#: pcbnew/class_board.cpp:228 -msgid "Adhes_Back" -msgstr "Adhes_Dessous" +#: pcbnew/menubar_pcbframe.cpp:45 +msgid "&Open\tCtrl+O" +msgstr "&Ouvrir\tCtrl+O" -#: pcbnew/class_board.cpp:229 -msgid "Adhes_Front" -msgstr "Adhes_Dessus" +#: pcbnew/menubar_pcbframe.cpp:46 +msgid "Delete current board and load new board" +msgstr "Effacer l'ancien C.I. et charger un nouveau" -#: pcbnew/class_board.cpp:230 -msgid "SoldP_Back" -msgstr "SoldP_Dessous" +#: pcbnew/menubar_pcbframe.cpp:54 +msgid "Open &Recent" +msgstr "Ouvrir &Recent" -#: pcbnew/class_board.cpp:231 -msgid "SoldP_Front" -msgstr "SoldP_Dessus" +#: pcbnew/menubar_pcbframe.cpp:55 +msgid "Open a recent opened board" +msgstr "Ouvrir un circuit impirmé récemment ouvert" -#: pcbnew/class_board.cpp:232 -msgid "SilkS_Back" -msgstr "SilkS_Dessous" +#: pcbnew/menubar_pcbframe.cpp:59 +msgid "&Append Board" +msgstr "&Ajouter Circuit Imprimé" -#: pcbnew/class_board.cpp:233 -msgid "SilkS_Front" -msgstr "Sérigr_Dessus" +#: pcbnew/menubar_pcbframe.cpp:60 +msgid "Append another PCBNew board to the current loaded board" +msgstr "Ajouter un nouveau circuit imprimé au circuit courant" -#: pcbnew/class_board.cpp:234 -msgid "Mask_Back" -msgstr "Masque_Dessous" +#: pcbnew/menubar_pcbframe.cpp:69 +msgid "&Save\tCtrl+S" +msgstr "&Sauver\tCtrl S" -#: pcbnew/class_board.cpp:235 -msgid "Mask_Front" -msgstr "Masque_Dessus" +#: pcbnew/menubar_pcbframe.cpp:70 +msgid "Save current board" +msgstr "Sauver le C.I. actuel" -#: pcbnew/class_board.cpp:236 -msgid "Drawings" -msgstr "Drawings " +#: pcbnew/menubar_pcbframe.cpp:76 +msgid "Save as...\tShift+Ctrl+S" +msgstr "Sauver sous...\tCtrl S" -#: pcbnew/class_board.cpp:237 -msgid "Comments" -msgstr "Commentaires " +#: pcbnew/menubar_pcbframe.cpp:77 +msgid "Save the current board as.." +msgstr "Sauver le Circuit Imprimé courant sous.." -#: pcbnew/class_board.cpp:238 -msgid "Eco1" -msgstr "Eco1 " +#: pcbnew/menubar_pcbframe.cpp:86 +msgid "&Revert" +msgstr "&Reprendre ancien" -#: pcbnew/class_board.cpp:239 -msgid "Eco2" -msgstr "Eco2 " +#: pcbnew/menubar_pcbframe.cpp:87 +msgid "Clear board and get previous saved version of board" +msgstr "Effacer le C.I. actuel et reprendre l'ancienne version sauvegardée" -#: pcbnew/class_board.cpp:240 -msgid "PCB_Edges" -msgstr "Contours_PCB" +#: pcbnew/menubar_pcbframe.cpp:92 +msgid "&Rescue" +msgstr "&Secours" -#: pcbnew/class_board.cpp:241 -msgid "BAD INDEX" -msgstr "BAD INDEX" +#: pcbnew/menubar_pcbframe.cpp:93 +msgid "Clear old board and get last rescue file" +msgstr "Effacer C.I. actuel et reprendre le dernier fichier secours" -#: pcbnew/class_board.cpp:819 -msgid "Nodes" -msgstr "Nodes" +#: pcbnew/menubar_pcbframe.cpp:104 +msgid "&Modules Position" +msgstr "Fichier &Modules Position" -#: pcbnew/class_board.cpp:822 -msgid "Nets" -msgstr "Nets" +#: pcbnew/menubar_pcbframe.cpp:105 +msgid "Generate modules position file for pick and place" +msgstr "Générer le fichier de position des modules pour machine d'insersion" -#: pcbnew/class_board.cpp:830 -msgid "Links" -msgstr "Liens" +#: pcbnew/menubar_pcbframe.cpp:110 +msgid "&Drill File" +msgstr "&Fichier de Perçage" -#: pcbnew/class_board.cpp:833 -msgid "Connect" -msgstr "Connect" +#: pcbnew/menubar_pcbframe.cpp:111 +msgid "Generate excellon2 drill file" +msgstr "Créer Fichier de perçage Excellon2" + +#: pcbnew/menubar_pcbframe.cpp:117 +msgid "&Component File" +msgstr "Fichier de &Composants" + +#: pcbnew/menubar_pcbframe.cpp:118 +msgid "(Re)create components file for CvPcb" +msgstr "(Re)créer le fichier de compsants *.cmp pour CvPcb" + +#: pcbnew/menubar_pcbframe.cpp:124 +msgid "&BOM File" +msgstr "Liste du &Matériel" + +#: pcbnew/menubar_pcbframe.cpp:125 +msgid "Create a bill of materials from schematic" +msgstr "Créer lune liste de matériel de la schématique" + +#: pcbnew/menubar_pcbframe.cpp:131 +msgid "Fabrication Outputs" +msgstr "Fichiers de Fabrication" + +#: pcbnew/menubar_pcbframe.cpp:132 +msgid "Generate files for fabrication" +msgstr "Générer des fichiers utiles pour la fabrication du circuit" + +#: pcbnew/menubar_pcbframe.cpp:140 +msgid "&Specctra Session" +msgstr "&Specctra Session" + +#: pcbnew/menubar_pcbframe.cpp:141 +msgid "Import a routed \"Specctra Session\" (*.ses) file" +msgstr "Importer un fichier de routage \"Specctra Session\" (*.ses) " + +#: pcbnew/menubar_pcbframe.cpp:155 +msgid "Import" +msgstr "Importer" + +#: pcbnew/menubar_pcbframe.cpp:156 +msgid "Import files" +msgstr "Importer fichiers" + +#: pcbnew/menubar_pcbframe.cpp:164 +msgid "&Specctra DSN" +msgstr "&Specctra DSN" + +#: pcbnew/menubar_pcbframe.cpp:165 +msgid "Export the current board to a \"Specctra DSN\" file" +msgstr "Exporte le CI courant dans un fichier au format \"Specctra DSN\"" + +#: pcbnew/menubar_pcbframe.cpp:171 +msgid "&GenCAD" +msgstr "&GenCAD" + +#: pcbnew/menubar_pcbframe.cpp:171 +msgid "Export GenCAD format" +msgstr "Exporter en format GenCAD" + +#: pcbnew/menubar_pcbframe.cpp:177 +msgid "&Module Report" +msgstr "Rapport &Modules" + +#: pcbnew/menubar_pcbframe.cpp:178 +msgid "Create a report of all modules on the current board" +msgstr "Créer un fichier rapport de tous les modules du C.I." + +#: pcbnew/menubar_pcbframe.cpp:182 +msgid "&Export" +msgstr "&Exporter" + +#: pcbnew/menubar_pcbframe.cpp:183 +msgid "Export board" +msgstr "Exporter le C.I." + +#: pcbnew/menubar_pcbframe.cpp:189 +msgid "&Print\tCtrl+P" +msgstr "Imprime&r\tCtrl+O" + +#: pcbnew/menubar_pcbframe.cpp:190 +msgid "Print pcb board" +msgstr "Imprimer C.I." + +#: pcbnew/menubar_pcbframe.cpp:195 +msgid "Print S&VG" +msgstr "Impression S&VG" + +#: pcbnew/menubar_pcbframe.cpp:196 +msgid "Plot board in Scalable Vector Graphics format" +msgstr "Tracer le circuit imprimé en format SVG (Scalable Vector Graphics)" + +#: pcbnew/menubar_pcbframe.cpp:201 +msgid "&Plot" +msgstr "&Tracer" + +#: pcbnew/menubar_pcbframe.cpp:202 +msgid "Plot board in HPGL, PostScript or Gerber RS-274X format)" +msgstr "Tracer le circuit en format HPGL, POSTSCRIPT ou GERBER RS-274X" + +#: pcbnew/menubar_pcbframe.cpp:210 +msgid "Add New Footprints" +msgstr "Ajouter Nouveaux Modules" + +#: pcbnew/menubar_pcbframe.cpp:211 +msgid "Archive new footprints only in a library (keep other footprints in this lib)" +msgstr "Archiver nouveaux modules seuls dans une librairie (garder les autres modules de cette librairie)" + +#: pcbnew/menubar_pcbframe.cpp:215 +msgid "Create Footprint Archive" +msgstr "Créer Archive des Modules" + +#: pcbnew/menubar_pcbframe.cpp:216 +msgid "Archive all footprints in a library (old library will be deleted)" +msgstr "Archiver tous les modules dans une librairie (l'ancienne librairie sera supprimée)" + +#: pcbnew/menubar_pcbframe.cpp:221 +msgid "Archive Footprints" +msgstr "Archiver Modules" + +#: pcbnew/menubar_pcbframe.cpp:222 +msgid "Archive or add footprints in a library file" +msgstr "Archiver ou ajouter les modules dans un fichier librairie" + +#: pcbnew/menubar_pcbframe.cpp:229 +msgid "&Quit" +msgstr "&Quitter" + +#: pcbnew/menubar_pcbframe.cpp:230 +msgid "Quit PCBNew" +msgstr "Quitter PCBnew" + +#: pcbnew/menubar_pcbframe.cpp:244 +msgid "Undo" +msgstr "Undo" + +#: pcbnew/menubar_pcbframe.cpp:246 +#, fuzzy +msgid "Undo\tCtrl+Z" +msgstr "&Ouvrir\tCtrl+O" + +#: pcbnew/menubar_pcbframe.cpp:255 +msgid "Redo" +msgstr "Redo" + +#: pcbnew/menubar_pcbframe.cpp:257 +msgid "Redo\tShift+Ctrl+Z" +msgstr "" + +#: pcbnew/menubar_pcbframe.cpp:269 +msgid "&Find" +msgstr "&Chercher" + +#: pcbnew/menubar_pcbframe.cpp:271 +msgid "Find\tCtrl+F" +msgstr "Chercher\tCtrl+F" + +#: pcbnew/menubar_pcbframe.cpp:275 +msgid "Find components and text in current loaded board" +msgstr "Recherche de composants et textes sur le circuit" + +#: pcbnew/menubar_pcbframe.cpp:284 +msgid "Global &Deletions" +msgstr "Effacements &Généraux" + +#: pcbnew/menubar_pcbframe.cpp:285 +msgid "Delete tracks, modules, texts... on board" +msgstr "Effacer pistes, modules, textes... sur le C.I." + +#: pcbnew/menubar_pcbframe.cpp:291 +#, fuzzy +msgid "&Cleanup Tracks and Vias" +msgstr "Changer Taille Pistes et Vias" + +#: pcbnew/menubar_pcbframe.cpp:292 +msgid "Clean stubs, vias, delete break points, or connect dangling tracks to pads and vias" +msgstr "Nettoyer bouts de pistes, vias, points inutiles, ou connecter extrémités de pistes mal connectées au centre de pads ou vias" + +#: pcbnew/menubar_pcbframe.cpp:298 +msgid "&Swap Layers" +msgstr "&Permutte Couches" + +#: pcbnew/menubar_pcbframe.cpp:299 +msgid "Swap tracks on copper layers or drawings on others layers" +msgstr "Permutation de couches" + +#: pcbnew/menubar_pcbframe.cpp:311 +#: pcbnew/menubar_pcbframe.cpp:317 +msgid "Zoom In" +msgstr "Zoom +" + +#: pcbnew/menubar_pcbframe.cpp:314 +#, fuzzy +msgid "Zoom In\tCtrl++" +msgstr "Zoom +" + +#: pcbnew/menubar_pcbframe.cpp:327 +#, fuzzy +msgid "Zoom Out\tCtrl+-" +msgstr "Zoom -" + +#: pcbnew/menubar_pcbframe.cpp:330 +msgid "Zoom Out" +msgstr "Zoom -" + +#: pcbnew/menubar_pcbframe.cpp:337 +msgid "Fit on Screen" +msgstr "Ajuster à l'Ecran " + +#: pcbnew/menubar_pcbframe.cpp:340 +msgid "Fit on Screen\tCtrl+0" +msgstr "" + +#: pcbnew/menubar_pcbframe.cpp:344 +msgid "Zoom to fit the board on the screen" +msgstr "Zoom popur ajuster le circuit impriméà l'écran" + +#: pcbnew/menubar_pcbframe.cpp:353 +msgid "Redraw" +msgstr "Redessin de l'écran" + +#: pcbnew/menubar_pcbframe.cpp:356 +msgid "Redraw\tCtrl+R" +msgstr "Redessiner\tCtrl+R" + +#: pcbnew/menubar_pcbframe.cpp:360 +msgid "Redraw the screen of the board" +msgstr "Redessiner l'écran du circuit imprimé" + +#: pcbnew/menubar_pcbframe.cpp:369 +msgid "&List Nets" +msgstr "Liste Equipots" + +#: pcbnew/menubar_pcbframe.cpp:370 +msgid "View a list of nets with names and id's" +msgstr "Lister les équipotentielles (noms et numéros d'identification)" + +#: pcbnew/menubar_pcbframe.cpp:389 +msgid "&Library" +msgstr "&Librairie" + +#: pcbnew/menubar_pcbframe.cpp:390 +msgid "Setting libraries, directories and others..." +msgstr "Sélectionner les librairies, répertoires et autres" + +#: pcbnew/menubar_pcbframe.cpp:396 +msgid "&Colors and Visibility" +msgstr "&Couleurs et Visibilité" + +#: pcbnew/menubar_pcbframe.cpp:397 +msgid "Select colors and visibility of layers and some items" +msgstr "Sélection les couleurs et l' affichage des couches et de certains éléments du C.I." + +#: pcbnew/menubar_pcbframe.cpp:402 +msgid "&General" +msgstr "&Général " + +#: pcbnew/menubar_pcbframe.cpp:403 +msgid "Select general options for PCBnew" +msgstr " Sélection options générales pour PCBNEW" + +#: pcbnew/menubar_pcbframe.cpp:409 +msgid "&Display" +msgstr "&Affichage" + +#: pcbnew/menubar_pcbframe.cpp:410 +msgid "Select how items (pads, tracks texts ... ) are displayed" +msgstr "Sélectionner comment les éléments (pads, pistes, textes ...) sont affichés" + +#: pcbnew/menubar_pcbframe.cpp:419 +msgid "Adjust user grid dimensions" +msgstr "Ajuster taille grille utilisateur" + +#: pcbnew/menubar_pcbframe.cpp:425 +msgid "Texts and Drawings" +msgstr "Textes et Tracés" + +#: pcbnew/menubar_pcbframe.cpp:426 +msgid "Adjust dimensions for texts and drawings" +msgstr "Ajuster dimensions pour textes et graphiques" + +#: pcbnew/menubar_pcbframe.cpp:432 +msgid "Adjust default pad characteristics" +msgstr "Ajuster les caracteristiques par défaut des pads" + +#: pcbnew/menubar_pcbframe.cpp:438 +msgid "Pads Mask Clearance" +msgstr "Marge Masque des Pads" + +#: pcbnew/menubar_pcbframe.cpp:439 +msgid "Adjust the global clearance between pads and the solder resist mask" +msgstr "Ajuster la marge globale entre pads et le masque de vernis épargne" + +#: pcbnew/menubar_pcbframe.cpp:446 +msgid "&Save" +msgstr "&Sauver" + +#: pcbnew/menubar_pcbframe.cpp:447 +msgid "Save dimension preferences" +msgstr "Sauver les préférences de dimension" + +#: pcbnew/menubar_pcbframe.cpp:453 +msgid "Di&mensions" +msgstr "Di&mensions" + +#: pcbnew/menubar_pcbframe.cpp:454 +msgid "Global dimensions preferences" +msgstr "Préférences générales de dimensions" + +#: pcbnew/menubar_pcbframe.cpp:467 +msgid "&Save Preferences" +msgstr "&Sauver Préférences" + +#: pcbnew/menubar_pcbframe.cpp:468 +msgid "Save application preferences" +msgstr "Sauver les préférences de l'application" + +#: pcbnew/menubar_pcbframe.cpp:473 +msgid "&Read Preferences" +msgstr "&Lire Préférences" + +#: pcbnew/menubar_pcbframe.cpp:474 +msgid "Read application preferences" +msgstr "Lire les préférences de l'application" + +#: pcbnew/menubar_pcbframe.cpp:486 +msgid "Design Rules" +msgstr "Règles de Conception" + +#: pcbnew/menubar_pcbframe.cpp:487 +msgid "Open the design rules editor" +msgstr "Ouvrir la fenêtre de dialogue de l'éditeur de règles de conception" + +#: pcbnew/menubar_pcbframe.cpp:492 +msgid "&Layers Setup" +msgstr "&Options Couches" + +#: pcbnew/menubar_pcbframe.cpp:493 +msgid "Enable and set layer properties" +msgstr "Activer les couches et ajuster leur propriétés" + +#: pcbnew/menubar_pcbframe.cpp:503 +msgid "Open the PCBnew manual" +msgstr "Ouvrir la documentation de PCPnew" + +#: pcbnew/menubar_pcbframe.cpp:511 +msgid "&About" +msgstr "&Au Sujet de" + +#: pcbnew/menubar_pcbframe.cpp:512 +msgid "About PCBnew printed circuit board designer" +msgstr "Au Sujet de PCBnew outil de conception de C.I." + +#: pcbnew/menubar_pcbframe.cpp:521 +msgid "&File" +msgstr "&Fichiers" + +#: pcbnew/menubar_pcbframe.cpp:522 +msgid "&Edit" +msgstr "&Editer" + +#: pcbnew/menubar_pcbframe.cpp:523 +msgid "&View" +msgstr "&Affichage" + +#: pcbnew/menubar_pcbframe.cpp:524 +msgid "&Preferences" +msgstr "&Préférences" + +#: pcbnew/menubar_pcbframe.cpp:525 +msgid "&Design Rules" +msgstr "&Règles de Conception" #: pcbnew/dialog_general_options_BoardEditor_base.cpp:22 msgid "No Display" @@ -6392,6 +6758,90 @@ msgstr "Sauver Options" msgid "Generate drill file" msgstr "Créer Fichier de perçage" +#: pcbnew/class_board.cpp:52 +msgid "This is the default net class." +msgstr "Ceci est la Netclass par défaut" + +#: pcbnew/class_board.cpp:212 +msgid "Front" +msgstr "Dessus" + +#: pcbnew/class_board.cpp:228 +msgid "Adhes_Back" +msgstr "Adhes_Dessous" + +#: pcbnew/class_board.cpp:229 +msgid "Adhes_Front" +msgstr "Adhes_Dessus" + +#: pcbnew/class_board.cpp:230 +msgid "SoldP_Back" +msgstr "SoldP_Dessous" + +#: pcbnew/class_board.cpp:231 +msgid "SoldP_Front" +msgstr "SoldP_Dessus" + +#: pcbnew/class_board.cpp:232 +msgid "SilkS_Back" +msgstr "SilkS_Dessous" + +#: pcbnew/class_board.cpp:233 +msgid "SilkS_Front" +msgstr "Sérigr_Dessus" + +#: pcbnew/class_board.cpp:234 +msgid "Mask_Back" +msgstr "Masque_Dessous" + +#: pcbnew/class_board.cpp:235 +msgid "Mask_Front" +msgstr "Masque_Dessus" + +#: pcbnew/class_board.cpp:236 +msgid "Drawings" +msgstr "Drawings " + +#: pcbnew/class_board.cpp:237 +msgid "Comments" +msgstr "Commentaires " + +#: pcbnew/class_board.cpp:238 +msgid "Eco1" +msgstr "Eco1 " + +#: pcbnew/class_board.cpp:239 +msgid "Eco2" +msgstr "Eco2 " + +#: pcbnew/class_board.cpp:240 +msgid "PCB_Edges" +msgstr "Contours_PCB" + +#: pcbnew/class_board.cpp:241 +msgid "BAD INDEX" +msgstr "BAD INDEX" + +#: pcbnew/class_board.cpp:819 +msgid "Nodes" +msgstr "Nodes" + +#: pcbnew/class_board.cpp:822 +msgid "Nets" +msgstr "Nets" + +#: pcbnew/class_board.cpp:830 +msgid "Links" +msgstr "Liens" + +#: pcbnew/class_board.cpp:833 +msgid "Connect" +msgstr "Connect" + +#: pcbnew/layer_panel_base.cpp:71 +msgid "Render" +msgstr "Autres" + #: pcbnew/dialog_global_pads_edition_base.cpp:23 msgid "Pad Filter :" msgstr "Filtre Pad :" @@ -6432,6 +6882,26 @@ msgstr "Valeur incorrecte pour offset du pad" msgid "Unknown netname, no change" msgstr "Net inconnu, pas de changement" +#: pcbnew/layer_widget.cpp:262 +msgid "Show All Cu" +msgstr "Afficher toutes couches cuivre" + +#: pcbnew/layer_widget.cpp:265 +msgid "Hide All Cu" +msgstr "Cacher Cu" + +#: pcbnew/layer_widget.cpp:418 +msgid "Left click to select, middle click for color change, right click for menu" +msgstr "Cliquer sur bouton gauche pour selectionner, du milieu pour changer la couleur, droit pour le menu" + +#: pcbnew/layer_widget.cpp:437 +msgid "Enable this for visibility" +msgstr "Activer ceci pour activer la visibilité" + +#: pcbnew/layer_widget.cpp:456 +msgid "Middle click for color change" +msgstr "Clicquer sur bouton du milieu pour changer la couleur" + #: pcbnew/gen_drill_report_files.cpp:263 msgid "" " Drill map: Too many diameter values to draw to draw one symbol per drill value (max 13)\n" @@ -6440,455 +6910,6 @@ msgstr "" "Plan de perçage: trop de diamètres différents pour tracer 1 symbole par diamètre (max 13)\n" "Le tracé utilise des cercles pour quelques valeurs " -#: pcbnew/menubar_pcbframe.cpp:39 -msgid "&New\tCtrl+N" -msgstr "&Nouveau\tCtrl+N" - -#: pcbnew/menubar_pcbframe.cpp:40 -msgid "Clear current board and initialize a new one" -msgstr "Effacer l'ancien C.I. et initialiser un nouveau" - -#: pcbnew/menubar_pcbframe.cpp:45 -msgid "&Open\tCtrl+O" -msgstr "&Ouvrir\tCtrl+O" - -#: pcbnew/menubar_pcbframe.cpp:46 -msgid "Delete current board and load new board" -msgstr "Effacer l'ancien C.I. et charger un nouveau" - -#: pcbnew/menubar_pcbframe.cpp:54 -msgid "Open &Recent" -msgstr "Ouvrir &Recent" - -#: pcbnew/menubar_pcbframe.cpp:55 -msgid "Open a recent opened board" -msgstr "Ouvrir un circuit impirmé récemment ouvert" - -#: pcbnew/menubar_pcbframe.cpp:59 -msgid "&Append Board" -msgstr "&Ajouter Circuit Imprimé" - -#: pcbnew/menubar_pcbframe.cpp:60 -msgid "Append a other PCBNew board to the current loaded board" -msgstr "Ajouter un nouveau circuit imprimé au circuit courant" - -#: pcbnew/menubar_pcbframe.cpp:69 -msgid "&Save\tCtrl+S" -msgstr "&Sauver\tCtrl S" - -#: pcbnew/menubar_pcbframe.cpp:70 -msgid "Save current board" -msgstr "Sauver le C.I. actuel" - -#: pcbnew/menubar_pcbframe.cpp:76 -msgid "Save as...\tShift+Ctrl+S" -msgstr "Sauver sous...\tCtrl S" - -#: pcbnew/menubar_pcbframe.cpp:77 -msgid "Save the current board as.." -msgstr "Sauver le Circuit Imprimé courant sous.." - -#: pcbnew/menubar_pcbframe.cpp:86 -msgid "&Revert" -msgstr "&Reprendre ancien" - -#: pcbnew/menubar_pcbframe.cpp:87 -msgid "Clear board and get previous saved version of board" -msgstr "Effacer le C.I. actuel et reprendre l'ancienne version sauvegardée" - -#: pcbnew/menubar_pcbframe.cpp:92 -msgid "&Rescue" -msgstr "&Secours" - -#: pcbnew/menubar_pcbframe.cpp:93 -msgid "Clear old board and get last rescue file" -msgstr "Effacer C.I. actuel et reprendre le dernier fichier secours" - -#: pcbnew/menubar_pcbframe.cpp:104 -msgid "&Modules Position" -msgstr "Fichier &Modules Position" - -#: pcbnew/menubar_pcbframe.cpp:105 -msgid "Generate modules position file for pick and place" -msgstr "Générer le fichier de position des modules pour machine d'insersion" - -#: pcbnew/menubar_pcbframe.cpp:110 -msgid "&Drill File" -msgstr "&Fichier de Perçage" - -#: pcbnew/menubar_pcbframe.cpp:111 -msgid "Generate excellon2 drill file" -msgstr "Créer Fichier de perçage Excellon2" - -#: pcbnew/menubar_pcbframe.cpp:117 -msgid "&Component File" -msgstr "Fichier de &Composants" - -#: pcbnew/menubar_pcbframe.cpp:118 -msgid "(Re)create components file for CvPcb" -msgstr "(Re)créer le fichier de compsants *.cmp pour CvPcb" - -#: pcbnew/menubar_pcbframe.cpp:124 -msgid "&BOM File" -msgstr "Liste du &Matériel" - -#: pcbnew/menubar_pcbframe.cpp:125 -msgid "Create a bill of materials from schematic" -msgstr "Créer lune liste de matériel de la schématique" - -#: pcbnew/menubar_pcbframe.cpp:131 -msgid "Fabrication Outputs" -msgstr "Fichiers de Fabrication" - -#: pcbnew/menubar_pcbframe.cpp:132 -msgid "Generate files for fabrication" -msgstr "Générer des fichiers utiles pour la fabrication du circuit" - -#: pcbnew/menubar_pcbframe.cpp:140 -msgid "&Specctra Session" -msgstr "&Specctra Session" - -#: pcbnew/menubar_pcbframe.cpp:141 -msgid "Import a routed \"Specctra Session\" (*.ses) file" -msgstr "Importer un fichier de routage \"Specctra Session\" (*.ses) " - -#: pcbnew/menubar_pcbframe.cpp:155 -#: eeschema/libframe.cpp:718 -msgid "Import" -msgstr "Importer" - -#: pcbnew/menubar_pcbframe.cpp:156 -msgid "Import files" -msgstr "Importer fichiers" - -#: pcbnew/menubar_pcbframe.cpp:164 -msgid "&Specctra DSN" -msgstr "&Specctra DSN" - -#: pcbnew/menubar_pcbframe.cpp:165 -msgid "Export the current board to a \"Specctra DSN\" file" -msgstr "Exporte le CI courant dans un fichier au format \"Specctra DSN\"" - -#: pcbnew/menubar_pcbframe.cpp:171 -msgid "&GenCAD" -msgstr "&GenCAD" - -#: pcbnew/menubar_pcbframe.cpp:171 -msgid "Export GenCAD Format" -msgstr "Exporter en Format GenCAD" - -#: pcbnew/menubar_pcbframe.cpp:177 -msgid "&Module Report" -msgstr "Rapport &Modules" - -#: pcbnew/menubar_pcbframe.cpp:178 -msgid "Create a report of all modules on the current board" -msgstr "Créer un fichier rapport de tous les modules du C.I." - -#: pcbnew/menubar_pcbframe.cpp:182 -msgid "&Export" -msgstr "&Exporter" - -#: pcbnew/menubar_pcbframe.cpp:183 -msgid "Export board" -msgstr "Exporter le C.I." - -#: pcbnew/menubar_pcbframe.cpp:189 -msgid "&Print\tCtrl+P" -msgstr "Imprime&r\tCtrl+O" - -#: pcbnew/menubar_pcbframe.cpp:190 -msgid "Print pcb board" -msgstr "Imprimer C.I." - -#: pcbnew/menubar_pcbframe.cpp:195 -msgid "Print S&VG" -msgstr "Impression S&VG" - -#: pcbnew/menubar_pcbframe.cpp:196 -msgid "Plot board in Scalable Vector Graphics format" -msgstr "Tracer le circuit imprimé en format SVG (Scalable Vector Graphics)" - -#: pcbnew/menubar_pcbframe.cpp:201 -msgid "&Plot" -msgstr "&Tracer" - -#: pcbnew/menubar_pcbframe.cpp:202 -msgid "Plot board in HPGL, PostScript or Gerber RS-274X format)" -msgstr "Tracer le circuit en format HPGL, POSTSCRIPT ou GERBER RS-274X" - -#: pcbnew/menubar_pcbframe.cpp:210 -msgid "Add New Footprints" -msgstr "Ajouter Nouveaux Modules" - -#: pcbnew/menubar_pcbframe.cpp:212 -msgid "Archive new footprints only in a library (keep other footprints in this lib)" -msgstr "Archiver nouveaux modules seuls dans une librairie (garder les autres modules de cette librairie)" - -#: pcbnew/menubar_pcbframe.cpp:216 -msgid "Create Footprint Archive" -msgstr "Créer Archive des Modules" - -#: pcbnew/menubar_pcbframe.cpp:217 -msgid "Archive all footprints in a library(old lib will be deleted)" -msgstr "Archiver tous les modules dans une librairie (ancienne librairie supprimée)" - -#: pcbnew/menubar_pcbframe.cpp:222 -msgid "Archive Footprints" -msgstr "Archiver Modules" - -#: pcbnew/menubar_pcbframe.cpp:223 -msgid "Archive or add footprints in a library file" -msgstr "Archiver ou ajouter les modules dans un fichier librairie" - -#: pcbnew/menubar_pcbframe.cpp:230 -msgid "&Quit" -msgstr "&Quitter" - -#: pcbnew/menubar_pcbframe.cpp:231 -msgid "Quit PCBNew" -msgstr "Quitter PCBnew" - -#: pcbnew/menubar_pcbframe.cpp:245 -msgid "Undo" -msgstr "Undo" - -#: pcbnew/menubar_pcbframe.cpp:247 -#, fuzzy -msgid "Undo\tCtrl+Z" -msgstr "&Ouvrir\tCtrl+O" - -#: pcbnew/menubar_pcbframe.cpp:256 -msgid "Redo" -msgstr "Redo" - -#: pcbnew/menubar_pcbframe.cpp:258 -msgid "Redo\tShift+Ctrl+Z" -msgstr "" - -#: pcbnew/menubar_pcbframe.cpp:270 -msgid "&Find" -msgstr "&Chercher" - -#: pcbnew/menubar_pcbframe.cpp:272 -msgid "Find\tCtrl+F" -msgstr "Chercher\tCtrl+F" - -#: pcbnew/menubar_pcbframe.cpp:276 -msgid "Find components and text in current loaded board" -msgstr "Recherche de composants et textes sur le circuit" - -#: pcbnew/menubar_pcbframe.cpp:285 -msgid "Global &Deletions" -msgstr "Effacements &Généraux" - -#: pcbnew/menubar_pcbframe.cpp:286 -msgid "Delete tracks, modules, texts... on board" -msgstr "Effacer pistes, modules, textes... sur le C.I." - -#: pcbnew/menubar_pcbframe.cpp:292 -msgid "&Tracks and Vias Cleanup" -msgstr "&Nettoyage Pistes et Vias" - -#: pcbnew/menubar_pcbframe.cpp:294 -msgid "Clean stubs, vias, delete break points, or connect dangling tracks to pads and vias" -msgstr "Nettoyer bouts de pistes, vias, points inutiles, ou connecter extrémités de pistes mal connectées au centre de pads ou vias" - -#: pcbnew/menubar_pcbframe.cpp:300 -msgid "&Swap Layers" -msgstr "&Permutte Couches" - -#: pcbnew/menubar_pcbframe.cpp:301 -msgid "Swap tracks on copper layers or drawings on others layers" -msgstr "Permutation de couches" - -#: pcbnew/menubar_pcbframe.cpp:313 -#: pcbnew/menubar_pcbframe.cpp:319 -msgid "Zoom In" -msgstr "Zoom +" - -#: pcbnew/menubar_pcbframe.cpp:316 -#, fuzzy -msgid "Zoom In\tCtrl++" -msgstr "Zoom +" - -#: pcbnew/menubar_pcbframe.cpp:329 -#, fuzzy -msgid "Zoom Out\tCtrl+-" -msgstr "Zoom -" - -#: pcbnew/menubar_pcbframe.cpp:332 -msgid "Zoom Out" -msgstr "Zoom -" - -#: pcbnew/menubar_pcbframe.cpp:339 -msgid "Fit on Screen" -msgstr "Ajuster à l'Ecran " - -#: pcbnew/menubar_pcbframe.cpp:342 -msgid "Fit on Screen\tCtrl+0" -msgstr "" - -#: pcbnew/menubar_pcbframe.cpp:346 -msgid "Zoom to fit the board on the screen" -msgstr "Zoom popur ajuster le circuit impriméà l'écran" - -#: pcbnew/menubar_pcbframe.cpp:355 -msgid "Redraw" -msgstr "Redessin de l'écran" - -#: pcbnew/menubar_pcbframe.cpp:358 -msgid "Redraw\tCtrl+R" -msgstr "Redessiner\tCtrl+R" - -#: pcbnew/menubar_pcbframe.cpp:362 -msgid "Redraw the screen of the board" -msgstr "Redessiner l'écran du circuit imprimé" - -#: pcbnew/menubar_pcbframe.cpp:371 -msgid "&List Nets" -msgstr "Liste Equipots" - -#: pcbnew/menubar_pcbframe.cpp:372 -msgid "View a list of nets with names and id's" -msgstr "Lister les équipotentielles (noms et numéros d'identification)" - -#: pcbnew/menubar_pcbframe.cpp:391 -msgid "&Library" -msgstr "&Librairie" - -#: pcbnew/menubar_pcbframe.cpp:392 -msgid "Setting libraries, directories and others..." -msgstr "Sélectionner les librairies, répertoires et autres" - -#: pcbnew/menubar_pcbframe.cpp:398 -msgid "&Colors and Visibility" -msgstr "&Couleurs et Visibilité" - -#: pcbnew/menubar_pcbframe.cpp:399 -msgid "Select colors and visibility of layers and some items" -msgstr "Sélection les couleurs et l' affichage des couches et de certains éléments du C.I." - -#: pcbnew/menubar_pcbframe.cpp:404 -msgid "&General" -msgstr "&Général " - -#: pcbnew/menubar_pcbframe.cpp:405 -msgid "Select general options for PCBnew" -msgstr " Sélection options générales pour PCBNEW" - -#: pcbnew/menubar_pcbframe.cpp:411 -msgid "&Display" -msgstr "&Affichage" - -#: pcbnew/menubar_pcbframe.cpp:412 -msgid "Select how items (pads, tracks texts ... ) are displayed" -msgstr "Sélectionner comment les éléments (pads, pistes, textes ...) sont affichés" - -#: pcbnew/menubar_pcbframe.cpp:421 -msgid "Adjust user grid dimensions" -msgstr "Ajuster taille grille utilisateur" - -#: pcbnew/menubar_pcbframe.cpp:427 -msgid "Texts and Drawings" -msgstr "Textes et Tracés" - -#: pcbnew/menubar_pcbframe.cpp:428 -msgid "Adjust dimensions for texts and drawings" -msgstr "Ajuster dimensions pour textes et graphiques" - -#: pcbnew/menubar_pcbframe.cpp:434 -msgid "Adjust default pads caracteristics" -msgstr "Ajuster les caracteristiques par défaut des pads" - -#: pcbnew/menubar_pcbframe.cpp:440 -msgid "Pads Mask Clearance" -msgstr "Marge Masque des Pads" - -#: pcbnew/menubar_pcbframe.cpp:441 -msgid "Adjust the global clearance between pads and the solder resist mask" -msgstr "Ajuster la marge globale entre pads et le masque de vernis épargne" - -#: pcbnew/menubar_pcbframe.cpp:448 -msgid "&Save" -msgstr "&Sauver" - -#: pcbnew/menubar_pcbframe.cpp:449 -msgid "Save dimension preferences" -msgstr "Sauver les préférences de dimension" - -#: pcbnew/menubar_pcbframe.cpp:455 -msgid "Di&mensions" -msgstr "Di&mensions" - -#: pcbnew/menubar_pcbframe.cpp:456 -msgid "Global dimensions preferences" -msgstr "Préférences générales de dimensions" - -#: pcbnew/menubar_pcbframe.cpp:469 -msgid "&Save Preferences" -msgstr "&Sauver Préférences" - -#: pcbnew/menubar_pcbframe.cpp:470 -msgid "Save application preferences" -msgstr "Sauver les préférences de l'application" - -#: pcbnew/menubar_pcbframe.cpp:475 -msgid "&Read Preferences" -msgstr "&Lire Préférences" - -#: pcbnew/menubar_pcbframe.cpp:476 -msgid "Read application preferences" -msgstr "Lire les préférences de l'application" - -#: pcbnew/menubar_pcbframe.cpp:488 -msgid "Design Rules" -msgstr "Règles de Conception" - -#: pcbnew/menubar_pcbframe.cpp:489 -msgid "Open the design rules dialog editor" -msgstr "Ouvrir la fenêtre de dialogue de l'éditeur de règles de conception" - -#: pcbnew/menubar_pcbframe.cpp:494 -msgid "&Layers Setup" -msgstr "&Options Couches" - -#: pcbnew/menubar_pcbframe.cpp:495 -msgid "Enable and set properties of layers" -msgstr "Activer les couches et ajuster leur propriétés" - -#: pcbnew/menubar_pcbframe.cpp:505 -msgid "Open the PCBnew manual" -msgstr "Ouvrir la documentation de PCPnew" - -#: pcbnew/menubar_pcbframe.cpp:513 -msgid "&About" -msgstr "&Au Sujet de" - -#: pcbnew/menubar_pcbframe.cpp:514 -msgid "About PCBnew printed circuit board designer" -msgstr "Au Sujet de PCBnew outil de conception de C.I." - -#: pcbnew/menubar_pcbframe.cpp:523 -msgid "&File" -msgstr "&Fichiers" - -#: pcbnew/menubar_pcbframe.cpp:524 -msgid "&Edit" -msgstr "&Editer" - -#: pcbnew/menubar_pcbframe.cpp:525 -msgid "&View" -msgstr "&Affichage" - -#: pcbnew/menubar_pcbframe.cpp:526 -msgid "&Preferences" -msgstr "&Préférences" - -#: pcbnew/menubar_pcbframe.cpp:527 -msgid "&Design Rules" -msgstr "&Règles de Conception" - #: pcbnew/toolbars_update_user_interface.cpp:39 msgid " mils" msgstr " mils" @@ -7100,34 +7121,17 @@ msgstr "Labels" msgid "Hierar." msgstr "Hiérar." -#: eeschema/viewlibs.cpp:108 -msgid "Library Browser" -msgstr "Visualisateur de Librairies" +#: eeschema/eelayer.cpp:243 +msgid "White" +msgstr "Blanc" -#: eeschema/viewlibs.cpp:115 -#: eeschema/libedit.cpp:32 -msgid "no library selected" -msgstr "Pas de librairie sélectionnée" +#: eeschema/eelayer.cpp:244 +msgid "Black" +msgstr "Noir" -#: eeschema/viewlibs.cpp:319 -#: eeschema/libedit.cpp:305 -msgid "Part" -msgstr "Part" - -#: eeschema/viewlibs.cpp:320 -#: eeschema/libedit.cpp:317 -msgid "Alias" -msgstr "Alias" - -#: eeschema/viewlibs.cpp:321 -#: eeschema/libedit.cpp:343 -msgid "Description" -msgstr "Description" - -#: eeschema/viewlibs.cpp:322 -#: eeschema/libedit.cpp:350 -msgid "Key words" -msgstr "Mots clé" +#: eeschema/eelayer.cpp:247 +msgid "Background Color:" +msgstr "Couleur du Fond:" #: eeschema/annotate.cpp:285 #, c-format @@ -7181,158 +7185,29 @@ msgstr "Valeurs différentes pour %s%d%c (%s) et %s%d%c (%s)" msgid "duplicate time stamp (%s) for %s%d and %s%d" msgstr "signature temporelle dupliquée (%s) pour %s%d et %s%d" -#: eeschema/libedit.cpp:25 -msgid "Component Library Editor: " -msgstr "Editeur de Composants: " +#: eeschema/viewlibs.cpp:108 +msgid "Library Browser" +msgstr "Visualisateur de Librairies" -#: eeschema/libedit.cpp:68 -msgid "" -"Current part not saved.\n" -"\n" -"Discard current changes?" -msgstr "" -"Composant courant non sauvé.\n" -"\n" -"Perdre les changements en cours ?" +#: eeschema/viewlibs.cpp:115 +msgid "no library selected" +msgstr "Pas de librairie sélectionnée" -#: eeschema/libedit.cpp:98 -#, c-format -msgid "Component or alias name \"%s\" not found in library \"%s\"." -msgstr "Composant ou alias \"%s\" non trouvé en librairie \"%s\"." +#: eeschema/viewlibs.cpp:314 +msgid "Part" +msgstr "Part" -#: eeschema/libedit.cpp:168 -#, c-format -msgid "Could not create copy of part <%s> in library <%s>." -msgstr "Ne peut créer une copie de l'élément <%s> en librairie <%s>." +#: eeschema/viewlibs.cpp:315 +msgid "Alias" +msgstr "Alias" -#: eeschema/libedit.cpp:249 -msgid "Include last component changes?" -msgstr "Inclure les dernières modifications du composant" +#: eeschema/viewlibs.cpp:316 +msgid "Description" +msgstr "Description" -#: eeschema/libedit.cpp:261 -msgid "Modify library file \"" -msgstr "Modifier le fichier Librairie \"" - -#: eeschema/libedit.cpp:261 -msgid "\"?" -msgstr "\"?" - -#: eeschema/libedit.cpp:272 -msgid "Error while saving library file \"" -msgstr "Erreur en sauvant le fichier librairie \"" - -#: eeschema/libedit.cpp:273 -msgid "\"." -msgstr "\"." - -#: eeschema/libedit.cpp:274 -msgid "*** ERROR: ***" -msgstr "***ERREUR:****" - -#: eeschema/libedit.cpp:279 -msgid "Library file \"" -msgstr "Fichier librairie \"" - -#: eeschema/libedit.cpp:281 -msgid "Document file \"" -msgstr "Fichier de doc \"" - -#: eeschema/libedit.cpp:322 -msgid "Unit" -msgstr "Unité" - -#: eeschema/libedit.cpp:325 -msgid "Convert" -msgstr "Convert" - -#: eeschema/libedit.cpp:329 -msgid "Body" -msgstr "Body" - -#: eeschema/libedit.cpp:332 -msgid "Power Symbol" -msgstr "Symbole d'Alimentation" - -#: eeschema/libedit.cpp:334 -msgid "Component" -msgstr "Composant" - -#: eeschema/libedit.cpp:386 -msgid "Please select a component library." -msgstr "SVP sélectionner une librairie de composants." - -#: eeschema/libedit.cpp:395 -#, c-format -msgid "Component library <%s> is empty." -msgstr "Fichier librairie de composants <%s> vide" - -#: eeschema/libedit.cpp:397 -msgid "Delete Entry Error" -msgstr "Erreur en suppression d'élément" - -#: eeschema/libedit.cpp:402 -#, c-format -msgid "" -"Select 1 of %d components to delete\n" -"from library <%s>." -msgstr "" -"Selection 1 de %d composants a supprimer\n" -"de la librairie <%s>." - -#: eeschema/libedit.cpp:406 -msgid "Delete Component" -msgstr "Suppression Composant" - -#: eeschema/libedit.cpp:415 -#, c-format -msgid "Entry <%s> not found in library <%s>." -msgstr "Element <%s> non trouvé en librairie <%s>." - -#: eeschema/libedit.cpp:422 -#, c-format -msgid "Delete component \"%s\" from library \"%s\"?" -msgstr "Supprimer composant \"%s\" de la librairie \"%s\"?" - -#: eeschema/libedit.cpp:442 -msgid "The component being deleted has been modified. All changes will be lost. Discard changes?" -msgstr "Le composant à supprimer a été modifié. Tous les changements seront perdus. Ignorer les changements?" - -#: eeschema/libedit.cpp:497 -msgid "" -"All changes to the current component will be lost!\n" -"\n" -"Clear the current component from the screen?" -msgstr "" -"Tous les changements du composant courant seront perdus\n" -"\n" -"Supprimer le composant courant de l'écran?" - -#: eeschema/libedit.cpp:513 -msgid "This new component has no name and cannot be created. Aborted" -msgstr "Ce noveau composant n'a pas de nom et ne peut être créé, Abandon" - -#: eeschema/libedit.cpp:525 -#, c-format -msgid "Component \"%s\" already exists in library \"%s\"." -msgstr "Composant \"%s\" déjà existant en librairie \"%s\"." - -#: eeschema/libedit.cpp:593 -msgid "No component to save." -msgstr "Pas de composant à sauver." - -#: eeschema/libedit.cpp:602 -msgid "No library specified." -msgstr "Pas de librairie spécifiée." - -#: eeschema/libedit.cpp:612 -#, c-format -msgid "Component \"%s\" exists. Change it?" -msgstr "Le composant \" %s\" existe, Le changer ?" - -#: eeschema/libedit.cpp:630 -#, c-format -msgid "Component %s saved in library %s" -msgstr "Composant %s sauvé en librairie %s" +#: eeschema/viewlibs.cpp:317 +msgid "Key words" +msgstr "Mots clé" #: eeschema/hotkeys.cpp:333 msgid "Add Component" @@ -7667,18 +7542,6 @@ msgstr "Navigateur" msgid "Root" msgstr "Racine" -#: eeschema/eelayer.cpp:243 -msgid "White" -msgstr "Blanc" - -#: eeschema/eelayer.cpp:244 -msgid "Black" -msgstr "Noir" - -#: eeschema/eelayer.cpp:247 -msgid "Background Color:" -msgstr "Couleur du Fond:" - #: eeschema/selpart.cpp:26 msgid "No component libraries are loaded." msgstr "Pas de librairies de composants chargées." @@ -7692,14 +7555,163 @@ msgstr "Selection 1 parmi %d librairies." msgid "Select Library" msgstr "Sélection Librairie" -#: eeschema/eeschema_config.cpp:329 -msgid "Save Project Settings" -msgstr "Sauver Optionsr Projet" - -#: eeschema/eeredraw.cpp:96 +#: eeschema/eeredraw.cpp:80 msgid "Sheet" msgstr "Feuille" +#: eeschema/libedit.cpp:25 +msgid "Component Library Editor: " +msgstr "Editeur de Composants: " + +#: eeschema/libedit.cpp:68 +msgid "" +"Current part not saved.\n" +"\n" +"Discard current changes?" +msgstr "" +"Composant courant non sauvé.\n" +"\n" +"Perdre les changements en cours ?" + +#: eeschema/libedit.cpp:98 +#, c-format +msgid "Component or alias name \"%s\" not found in library \"%s\"." +msgstr "Composant ou alias \"%s\" non trouvé en librairie \"%s\"." + +#: eeschema/libedit.cpp:168 +#, c-format +msgid "Could not create copy of part <%s> in library <%s>." +msgstr "Ne peut créer une copie de l'élément <%s> en librairie <%s>." + +#: eeschema/libedit.cpp:235 +msgid "Include last component changes?" +msgstr "Inclure les dernières modifications du composant" + +#: eeschema/libedit.cpp:247 +msgid "Modify library file \"" +msgstr "Modifier le fichier Librairie \"" + +#: eeschema/libedit.cpp:247 +msgid "\"?" +msgstr "\"?" + +#: eeschema/libedit.cpp:258 +msgid "Error while saving library file \"" +msgstr "Erreur en sauvant le fichier librairie \"" + +#: eeschema/libedit.cpp:259 +msgid "\"." +msgstr "\"." + +#: eeschema/libedit.cpp:260 +msgid "*** ERROR: ***" +msgstr "***ERREUR:****" + +#: eeschema/libedit.cpp:265 +msgid "Library file \"" +msgstr "Fichier librairie \"" + +#: eeschema/libedit.cpp:267 +msgid "Document file \"" +msgstr "Fichier de doc \"" + +#: eeschema/libedit.cpp:308 +msgid "Unit" +msgstr "Unité" + +#: eeschema/libedit.cpp:311 +msgid "Convert" +msgstr "Convert" + +#: eeschema/libedit.cpp:315 +msgid "Body" +msgstr "Body" + +#: eeschema/libedit.cpp:318 +msgid "Power Symbol" +msgstr "Symbole d'Alimentation" + +#: eeschema/libedit.cpp:320 +msgid "Component" +msgstr "Composant" + +#: eeschema/libedit.cpp:372 +msgid "Please select a component library." +msgstr "SVP sélectionner une librairie de composants." + +#: eeschema/libedit.cpp:381 +#, c-format +msgid "Component library <%s> is empty." +msgstr "Fichier librairie de composants <%s> vide" + +#: eeschema/libedit.cpp:383 +msgid "Delete Entry Error" +msgstr "Erreur en suppression d'élément" + +#: eeschema/libedit.cpp:388 +#, c-format +msgid "" +"Select 1 of %d components to delete\n" +"from library <%s>." +msgstr "" +"Selection 1 de %d composants a supprimer\n" +"de la librairie <%s>." + +#: eeschema/libedit.cpp:392 +msgid "Delete Component" +msgstr "Suppression Composant" + +#: eeschema/libedit.cpp:401 +#, c-format +msgid "Entry <%s> not found in library <%s>." +msgstr "Element <%s> non trouvé en librairie <%s>." + +#: eeschema/libedit.cpp:408 +#, c-format +msgid "Delete component \"%s\" from library \"%s\"?" +msgstr "Supprimer composant \"%s\" de la librairie \"%s\"?" + +#: eeschema/libedit.cpp:428 +msgid "The component being deleted has been modified. All changes will be lost. Discard changes?" +msgstr "Le composant à supprimer a été modifié. Tous les changements seront perdus. Ignorer les changements?" + +#: eeschema/libedit.cpp:483 +msgid "" +"All changes to the current component will be lost!\n" +"\n" +"Clear the current component from the screen?" +msgstr "" +"Tous les changements du composant courant seront perdus\n" +"\n" +"Supprimer le composant courant de l'écran?" + +#: eeschema/libedit.cpp:499 +msgid "This new component has no name and cannot be created. Aborted" +msgstr "Ce noveau composant n'a pas de nom et ne peut être créé, Abandon" + +#: eeschema/libedit.cpp:511 +#, c-format +msgid "Component \"%s\" already exists in library \"%s\"." +msgstr "Composant \"%s\" déjà existant en librairie \"%s\"." + +#: eeschema/libedit.cpp:579 +msgid "No component to save." +msgstr "Pas de composant à sauver." + +#: eeschema/libedit.cpp:588 +msgid "No library specified." +msgstr "Pas de librairie spécifiée." + +#: eeschema/libedit.cpp:598 +#, c-format +msgid "Component \"%s\" exists. Change it?" +msgstr "Le composant \" %s\" existe, Le changer ?" + +#: eeschema/libedit.cpp:616 +#, c-format +msgid "Component %s saved in library %s" +msgstr "Composant %s sauvé en librairie %s" + #: eeschema/symbedit.cpp:47 msgid "Import Symbol Drawings" msgstr "Importer Symbole de Dessin" @@ -9627,6 +9639,10 @@ msgstr "Imprimer Tout" msgid "Current" msgstr "Courant" +#: eeschema/eeschema_config.cpp:328 +msgid "Save Project Settings" +msgstr "Sauver Optionsr Projet" + #: eeschema/eelibs_read_libraryfiles.cpp:61 msgid "\n" msgstr "\n" @@ -10887,13 +10903,36 @@ msgstr "Clock Active Bas" msgid "Active Low Output" msgstr "Sortie Active Bas" -#: cvpcb/setvisu.cpp:47 -msgid "Footprint: " -msgstr "Module: " +#: cvpcb/cvframe.cpp:284 +msgid "" +"Net and component list modified.\n" +"Save before exit ?" +msgstr "" +"Netlist et liste composants modifiés,\n" +"Sauver avant de quitter ?" -#: cvpcb/setvisu.cpp:50 -msgid "Lib: " -msgstr "Lib: " +#: cvpcb/cvframe.cpp:308 +msgid "Problem when saving files, exit anyway ?" +msgstr "Problème en sauvant les fichiers, quitter quand même" + +#: cvpcb/cvframe.cpp:434 +msgid "Delete selections" +msgstr "Effacement des associations existantes" + +#: cvpcb/cvframe.cpp:448 +#: cvpcb/init.cpp:65 +#: cvpcb/init.cpp:115 +#, c-format +msgid "Components: %d (free: %d)" +msgstr "Composants: %d (libres: %d)" + +#: cvpcb/cvframe.cpp:470 +msgid "unnamed" +msgstr "non nommé" + +#: cvpcb/cvframe.cpp:472 +msgid "Open Net List" +msgstr "Ouvrir Fichier Netliste" #: cvpcb/listlib.cpp:62 msgid "No PCB foot print libraries are listed in the current project file." @@ -10979,37 +11018,6 @@ msgstr "Ouvrir la documentation de cvpcb" msgid "About cvpcb schematic to pcb converter" msgstr "Au sujet de Cvpcb, schématique vers pcb interface" -#: cvpcb/cvframe.cpp:284 -msgid "" -"Net and component list modified.\n" -"Save before exit ?" -msgstr "" -"Netlist et liste composants modifiés,\n" -"Sauver avant de quitter ?" - -#: cvpcb/cvframe.cpp:308 -msgid "Problem when saving files, exit anyway ?" -msgstr "Problème en sauvant les fichiers, quitter quand même" - -#: cvpcb/cvframe.cpp:434 -msgid "Delete selections" -msgstr "Effacement des associations existantes" - -#: cvpcb/cvframe.cpp:448 -#: cvpcb/init.cpp:65 -#: cvpcb/init.cpp:115 -#, c-format -msgid "Components: %d (free: %d)" -msgstr "Composants: %d (libres: %d)" - -#: cvpcb/cvframe.cpp:470 -msgid "unnamed" -msgstr "non nommé" - -#: cvpcb/cvframe.cpp:472 -msgid "Open Net List" -msgstr "Ouvrir Fichier Netliste" - #: cvpcb/cvpcb.cpp:29 msgid "Kicad retroannotation files (*.stf)|*.stf" msgstr "Fichiers de retroannotaion Kicad (*.stf)|*.stf" @@ -11026,6 +11034,14 @@ msgstr "Cvpcb est en cours d'exécution. Continuer ?" msgid " [no file]" msgstr " [pas de fichier]" +#: cvpcb/setvisu.cpp:47 +msgid "Footprint: " +msgstr "Module: " + +#: cvpcb/setvisu.cpp:50 +msgid "Lib: " +msgstr "Lib: " + #: cvpcb/genorcad.cpp:127 #, c-format msgid "%s %s pin %s : Different Nets" @@ -11114,26 +11130,6 @@ msgstr "Modules (Tous): %d" msgid "Footprints (filtered): %d" msgstr "Modules (filtrés): %d" -#: cvpcb/displayframe.cpp:156 -msgid "Display Options" -msgstr "Options d'Affichage" - -#: cvpcb/displayframe.cpp:162 -msgid "Zoom in (F1)" -msgstr "Zoom + (F1)" - -#: cvpcb/displayframe.cpp:166 -msgid "Zoom out (F2)" -msgstr "Zoom - (F2)" - -#: cvpcb/displayframe.cpp:170 -msgid "Redraw view (F3)" -msgstr "Redessin de l'écran (F3)" - -#: cvpcb/displayframe.cpp:174 -msgid "Zoom auto (Home)" -msgstr "Zoom Automatique (Home)" - #: cvpcb/loadcmp.cpp:46 #, c-format msgid "PCB foot print library file <%s> could not be found in the default search paths." @@ -11226,6 +11222,26 @@ msgstr "Montre la liste filtrée des modules pour le composant courant" msgid "Display the full footprint list (without filtering)" msgstr "Montre la liste complète des modules" +#: cvpcb/displayframe.cpp:156 +msgid "Display Options" +msgstr "Options d'Affichage" + +#: cvpcb/displayframe.cpp:162 +msgid "Zoom in (F1)" +msgstr "Zoom + (F1)" + +#: cvpcb/displayframe.cpp:166 +msgid "Zoom out (F2)" +msgstr "Zoom - (F2)" + +#: cvpcb/displayframe.cpp:170 +msgid "Redraw view (F3)" +msgstr "Redessin de l'écran (F3)" + +#: cvpcb/displayframe.cpp:174 +msgid "Zoom auto (Home)" +msgstr "Zoom Automatique (Home)" + #: cvpcb/dialog_display_options.cpp:150 #: cvpcb/dialog_display_options.cpp:162 msgid "&Line" @@ -11694,6 +11710,10 @@ msgstr "Format 2.3" msgid "format 3.4" msgstr "Format 3.4" +#: gerbview/block.cpp:269 +msgid "Ok to delete block ?" +msgstr "Ok pour effacer le bloc" + #: gerbview/readgerb.cpp:136 msgid "File " msgstr "Fichier " @@ -11795,10 +11815,6 @@ msgstr "Ext. Fichiers Gerber" msgid "D code File Ext:" msgstr "Ext. Fichiers DCodes:" -#: gerbview/block.cpp:269 -msgid "Ok to delete block ?" -msgstr "Ok pour effacer le bloc" - #: gerbview/set_color.cpp:272 msgid "Switch on all of the Gerber layers" msgstr "Affiche toutes les couches Gerber" @@ -12192,7 +12208,7 @@ msgstr "" msgid "Unable to find a PDF viewer for" msgstr "Impossible de trouver un visualisateur PDF pour" -#: common/selcolor.cpp:67 +#: common/selcolor.cpp:68 msgid "Colors" msgstr "Couleurs" @@ -12365,6 +12381,10 @@ msgstr "Inconnu" msgid " \"" msgstr " \"" +#: common/drawframe.cpp:330 +msgid "??" +msgstr "??" + #: common/get_component_dialog.cpp:69 msgid "History list:" msgstr "Historique:" @@ -12419,10 +12439,6 @@ msgstr "Fichier d'aide %s non trouvé" msgid "Help file %s could not be found." msgstr "Fichier d'aide %s non trouvé." -#: common/drawframe.cpp:330 -msgid "??" -msgstr "??" - #: common/dialog_load_error.cpp:7 msgid "Load Error!" msgstr "Erreur de Chargement!" @@ -13202,6 +13218,8 @@ msgstr "Options d'Affichage" msgid "Page Settings" msgstr "Ajustage opt Page" +#~ msgid "&Tracks and Vias Cleanup" +#~ msgstr "&Nettoyage Pistes et Vias" #~ msgid "Ratsnets" #~ msgstr "Chevelu" #~ msgid "Show the ratsnest" @@ -13681,8 +13699,6 @@ msgstr "Ajustage opt Page" #~ msgstr "Ajuste Perçage TOUTES Vias à Défaut" #~ msgid "Move Segment" #~ msgstr "Déplace Segment" -#~ msgid "Change Tracks and Vias Sizes" -#~ msgstr "Changer Taille Pistes et Vias" #~ msgid "Set Net to NetClass values" #~ msgstr "Ajuster le Net à la Valeur en NetClass" #~ msgid "Set ALL Tracks and Vias to NetClass Values" diff --git a/pcbnew/class_board.h b/pcbnew/class_board.h index c6055f7caf..b9e3a22f8f 100644 --- a/pcbnew/class_board.h +++ b/pcbnew/class_board.h @@ -411,7 +411,7 @@ public: * Function DrawHighLight * redraws the objects in the board that are associated with the given aNetCode * and turns on or off the brilliance associated with that net according to the - * current value of global g_HightLigt_Status + * current value of global g_HighLight_Status * @param aDrawPanel is needed for the clipping support. * @param aNetCode is the net number to highlight or to dim. */ diff --git a/pcbnew/cross-probing.cpp b/pcbnew/cross-probing.cpp index 3167535338..9be4190228 100644 --- a/pcbnew/cross-probing.cpp +++ b/pcbnew/cross-probing.cpp @@ -93,13 +93,13 @@ void RemoteCommand( const char* cmdline ) if( netcode > 0 ) /* highlight the pad net*/ { - g_HightLigt_Status = 1; - g_HightLigth_NetCode = netcode; + g_HighLight_Status = 1; + g_HighLight_NetCode = netcode; } else { - g_HightLigt_Status = 0; - g_HightLigth_NetCode = 0; + g_HighLight_Status = 0; + g_HighLight_NetCode = 0; } if( module == NULL ) diff --git a/pcbnew/deltrack.cpp b/pcbnew/deltrack.cpp index fd8474e52f..a566b48fbb 100644 --- a/pcbnew/deltrack.cpp +++ b/pcbnew/deltrack.cpp @@ -89,8 +89,8 @@ TRACK* WinEDA_PcbFrame::Delete_Segment( wxDC* DC, TRACK* aTrack ) DrawPanel->ManageCurseur = NULL; DrawPanel->ForceCloseManageCurseur = NULL; - if( g_HightLigt_Status ) - Hight_Light( DC ); + if( g_HighLight_Status ) + High_Light( DC ); SetCurItem( NULL ); return NULL; diff --git a/pcbnew/dialog_general_options.cpp b/pcbnew/dialog_general_options.cpp index 68848fd4ca..e18f48f770 100644 --- a/pcbnew/dialog_general_options.cpp +++ b/pcbnew/dialog_general_options.cpp @@ -249,12 +249,6 @@ void WinEDA_PcbFrame::OnSelectOptionToolbar( wxCommandEvent& event ) DrawPanel->Refresh(); break; - case ID_TB_OPTIONS_SHOW_INVISIBLE_TEXT_MODE: - g_DesignSettings.SetElementVisibility( MOD_TEXT_INVISIBLE, - m_OptionsToolBar->GetToolState( id ) ); - DrawPanel->Refresh(); - break; - case ID_TB_OPTIONS_SHOW_EXTRA_VERTICAL_TOOLBAR1: m_show_microwave_tools = m_OptionsToolBar->GetToolState( id ); #if !defined(KICAD_AUIMANAGER) diff --git a/pcbnew/edit.cpp b/pcbnew/edit.cpp index de31c18362..e52b60d8ae 100644 --- a/pcbnew/edit.cpp +++ b/pcbnew/edit.cpp @@ -238,8 +238,8 @@ void WinEDA_PcbFrame::Process_Special_Functions( wxCommandEvent& event ) SetToolID( id, wxCURSOR_PENCIL, _( "Add Zones" ) ); if( DisplayOpt.DisplayZonesMode != 0 ) DisplayInfoMessage( this, _( "Warning: Display Zone is OFF!!!" ) ); - if( !g_HightLigt_Status && (g_HightLigth_NetCode > 0 ) ) - Hight_Light( &dc ); + if( !g_HighLight_Status && (g_HighLight_NetCode > 0 ) ) + High_Light( &dc ); break; case ID_PCB_MIRE_BUTT: diff --git a/pcbnew/editrack-part2.cpp b/pcbnew/editrack-part2.cpp index b4f8461f66..951528e068 100644 --- a/pcbnew/editrack-part2.cpp +++ b/pcbnew/editrack-part2.cpp @@ -68,7 +68,8 @@ void WinEDA_PcbFrame::ExChange_Track_Layer( TRACK* pt_segm, wxDC* DC ) l1 = Route_Layer_TOP; l2 = Route_Layer_BOTTOM; pt_track = Marque_Une_Piste( GetBoard(), pt_segm, &nb_segm, NULL, true ); - Trace_Une_Piste( DrawPanel, DC, pt_track, nb_segm, GR_XOR ); + if ( DC ) + Trace_Une_Piste( DrawPanel, DC, pt_track, nb_segm, GR_XOR ); /* Clear the BUSY flag and backup member. Param layer original. */ ii = nb_segm; pt_segm = pt_track; @@ -101,7 +102,8 @@ void WinEDA_PcbFrame::ExChange_Track_Layer( TRACK* pt_segm, wxDC* DC ) pt_segm->SetLayer( pt_segm->m_Param ); } - Trace_Une_Piste( DrawPanel, DC, pt_track, nb_segm, GR_OR ); + if( DC ) + Trace_Une_Piste( DrawPanel, DC, pt_track, nb_segm, GR_OR ); DisplayError( this, _( "Drc error, canceled" ), 10 ); return; } @@ -180,7 +182,7 @@ bool WinEDA_PcbFrame::Other_Layer_Route( TRACK* aTrack, wxDC* DC ) via->m_Flags = IS_NEW; via->m_Shape = g_DesignSettings.m_CurrentViaType; via->m_Width = GetBoard()->GetCurrentViaSize(); - via->SetNet( g_HightLigth_NetCode ); + via->SetNet( g_HighLight_NetCode ); via->m_Start = via->m_End = g_CurrentTrackSegment->m_End; int old_layer = getActiveLayer(); diff --git a/pcbnew/editrack.cpp b/pcbnew/editrack.cpp index cc6f811504..2372ca8b92 100644 --- a/pcbnew/editrack.cpp +++ b/pcbnew/editrack.cpp @@ -42,12 +42,12 @@ static void Exit_Editrack( WinEDA_DrawPanel* Panel, wxDC* DC ) { /* Erase the current drawing */ ShowNewTrackWhenMovingCursor( Panel, DC, false ); - if( g_HightLigt_Status ) - frame->Hight_Light( DC ); + if( g_HighLight_Status ) + frame->High_Light( DC ); - g_HightLigth_NetCode = OldNetCodeSurbrillance; + g_HighLight_NetCode = OldNetCodeSurbrillance; if( OldEtatSurbrillance ) - frame->Hight_Light( DC ); + frame->High_Light( DC ); frame->MsgPanel->EraseMsgBox(); @@ -98,16 +98,16 @@ TRACK* WinEDA_PcbFrame::Begin_Route( TRACK* aTrack, wxDC* DC ) // but... /* erase old highlight */ - OldNetCodeSurbrillance = g_HightLigth_NetCode; - OldEtatSurbrillance = g_HightLigt_Status; + OldNetCodeSurbrillance = g_HighLight_NetCode; + OldEtatSurbrillance = g_HighLight_Status; - if( g_HightLigt_Status ) - Hight_Light( DC ); + if( g_HighLight_Status ) + High_Light( DC ); g_CurrentTrackList.PushBack( new TRACK( GetBoard() ) ); g_CurrentTrackSegment->m_Flags = IS_NEW; - g_HightLigth_NetCode = 0; + g_HighLight_NetCode = 0; // Search for a starting point of the new track, a track or pad LockPoint = LocateLockPoint( GetBoard(), pos, masquelayer ); @@ -120,12 +120,12 @@ TRACK* WinEDA_PcbFrame::Begin_Route( TRACK* aTrack, wxDC* DC ) /* A pad is found: put the starting point on pad centre */ pos = pt_pad->m_Pos; - g_HightLigth_NetCode = pt_pad->GetNet(); + g_HighLight_NetCode = pt_pad->GetNet(); } else /* A track segment is found */ { TrackOnStartPoint = (TRACK*) LockPoint; - g_HightLigth_NetCode = TrackOnStartPoint->GetNet(); + g_HighLight_NetCode = TrackOnStartPoint->GetNet(); CreateLockPoint( pos, TrackOnStartPoint, NULL, @@ -140,7 +140,7 @@ TRACK* WinEDA_PcbFrame::Begin_Route( TRACK* aTrack, wxDC* DC ) GetScreen()-> m_Active_Layer ); if( zone ) - g_HightLigth_NetCode = zone->GetNet(); + g_HighLight_NetCode = zone->GetNet(); } D( g_CurrentTrackList.VerifyListIntegrity(); ); @@ -149,10 +149,10 @@ TRACK* WinEDA_PcbFrame::Begin_Route( TRACK* aTrack, wxDC* DC ) D( g_CurrentTrackList.VerifyListIntegrity(); ); - Hight_Light( DC ); + High_Light( DC ); // Display info about track Net class, and init track and vias sizes: - g_CurrentTrackSegment->SetNet( g_HightLigth_NetCode ); + g_CurrentTrackSegment->SetNet( g_HighLight_NetCode ); GetBoard()->SetCurrentNetClass( g_CurrentTrackSegment->GetNetClassName() ); m_TrackAndViasSizesList_Changed = true; AuxiliaryToolBar_Update_UI(); @@ -474,7 +474,7 @@ void WinEDA_PcbFrame::End_Route( TRACK* aTrack, wxDC* DC ) * possibly create an anchor. */ { TRACK* adr_buf = (TRACK*) LockPoint; - g_HightLigth_NetCode = adr_buf->GetNet(); + g_HighLight_NetCode = adr_buf->GetNet(); /* Possible establishment of a hanging point. */ LockPoint = CreateLockPoint( g_CurrentTrackSegment->m_End, @@ -536,12 +536,12 @@ void WinEDA_PcbFrame::End_Route( TRACK* aTrack, wxDC* DC ) wxASSERT( g_CurrentTrackSegment==NULL ); wxASSERT( g_CurrentTrackList.GetCount()==0 ); - if( g_HightLigt_Status ) - Hight_Light( DC ); + if( g_HighLight_Status ) + High_Light( DC ); - g_HightLigth_NetCode = OldNetCodeSurbrillance; + g_HighLight_NetCode = OldNetCodeSurbrillance; if( OldEtatSurbrillance ) - Hight_Light( DC ); + High_Light( DC ); DrawPanel->ManageCurseur = NULL; DrawPanel->ForceCloseManageCurseur = NULL; diff --git a/pcbnew/initpcb.cpp b/pcbnew/initpcb.cpp index 65a6da8717..fb5f01e56b 100644 --- a/pcbnew/initpcb.cpp +++ b/pcbnew/initpcb.cpp @@ -175,7 +175,7 @@ bool WinEDA_PcbFrame::Clear_Pcb( bool aQuery ) GetScreen()->Init(); GetScreen()->SetGrid( gridsize ); - g_HightLigt_Status = 0; + g_HighLight_Status = 0; // Enable all layers (SetCopperLayerCount() will adjust the copper layers enabled) GetBoard()->SetEnabledLayers(ALL_LAYERS); diff --git a/pcbnew/move_or_drag_track.cpp b/pcbnew/move_or_drag_track.cpp index 1a9f9a73f4..058f8743e5 100644 --- a/pcbnew/move_or_drag_track.cpp +++ b/pcbnew/move_or_drag_track.cpp @@ -29,8 +29,8 @@ static bool InitialiseDragParameters(); static wxPoint PosInit, s_LastPos; static TRACK* NewTrack; /* New track or track being moved. */ static int NbPtNewTrack; -static int Old_HightLigth_NetCode; -static bool Old_HightLigt_Status; +static int Old_HighLigth_NetCode; +static bool Old_HighLigt_Status; static double s_StartSegmentSlope, s_EndSegmentSlope, s_MovingSegmentSlope, s_StartSegment_Yorg, s_EndSegment_Yorg, @@ -61,11 +61,11 @@ static void Abort_MoveTrack( WinEDA_DrawPanel* Panel, wxDC* DC ) Panel->ManageCurseur( Panel, DC, true ); Panel->GetScreen()->m_Curseur = oldpos; - g_HightLigt_Status = FALSE; + g_HighLight_Status = FALSE; ( (WinEDA_PcbFrame*) Panel->GetParent() )->GetBoard()->DrawHighLight( Panel, DC, - g_HightLigth_NetCode ); + g_HighLight_NetCode ); if( NewTrack ) { @@ -123,13 +123,13 @@ static void Abort_MoveTrack( WinEDA_DrawPanel* Panel, wxDC* DC ) // Clear the undo picker list: s_ItemsListPicker.ClearListAndDeleteItems(); - g_HightLigth_NetCode = Old_HightLigth_NetCode; - g_HightLigt_Status = Old_HightLigt_Status; - if( g_HightLigt_Status ) + g_HighLight_NetCode = Old_HighLigth_NetCode; + g_HighLight_Status = Old_HighLigt_Status; + if( g_HighLight_Status ) ( (WinEDA_PcbFrame*) Panel->GetParent() )->GetBoard()->DrawHighLight( Panel, DC, - g_HightLigth_NetCode ); + g_HighLight_NetCode ); EraseDragListe(); } @@ -647,10 +647,10 @@ void WinEDA_PcbFrame::Start_MoveOneNodeOrSegment( TRACK* track, EraseDragListe(); /* Change highlighted net: the new one will be highlighted */ - Old_HightLigt_Status = g_HightLigt_Status; - Old_HightLigth_NetCode = g_HightLigth_NetCode; - if( g_HightLigt_Status ) - Hight_Light( DC ); + Old_HighLigt_Status = g_HighLight_Status; + Old_HighLigth_NetCode = g_HighLight_NetCode; + if( g_HighLight_Status ) + High_Light( DC ); PosInit = GetScreen()->m_Curseur; if( track->Type() == TYPE_VIA ) @@ -722,10 +722,10 @@ void WinEDA_PcbFrame::Start_MoveOneNodeOrSegment( TRACK* track, DrawPanel->ManageCurseur = Show_MoveNode; DrawPanel->ForceCloseManageCurseur = Abort_MoveTrack; - g_HightLigth_NetCode = track->GetNet(); - g_HightLigt_Status = true; + g_HighLight_NetCode = track->GetNet(); + g_HighLight_Status = true; - GetBoard()->DrawHighLight( DrawPanel, DC, g_HightLigth_NetCode ); + GetBoard()->DrawHighLight( DrawPanel, DC, g_HighLight_NetCode ); DrawPanel->ManageCurseur( DrawPanel, DC, true ); } @@ -891,10 +891,10 @@ void WinEDA_PcbFrame::Start_DragTrackSegmentAndKeepSlope( TRACK* track, s_EndSegmentPresent = FALSE; /* Change high light net: the new one will be highlighted */ - Old_HightLigt_Status = g_HightLigt_Status; - Old_HightLigth_NetCode = g_HightLigth_NetCode; - if( g_HightLigt_Status ) - Hight_Light( DC ); + Old_HighLigt_Status = g_HighLight_Status; + Old_HighLigth_NetCode = g_HighLight_NetCode; + if( g_HighLight_Status ) + High_Light( DC ); EraseDragListe(); @@ -928,9 +928,9 @@ void WinEDA_PcbFrame::Start_DragTrackSegmentAndKeepSlope( TRACK* track, DrawPanel->ManageCurseur = Show_Drag_Track_Segment_With_Cte_Slope; DrawPanel->ForceCloseManageCurseur = Abort_MoveTrack; - g_HightLigth_NetCode = track->GetNet(); - g_HightLigt_Status = true; - GetBoard()->DrawHighLight( DrawPanel, DC, g_HightLigth_NetCode ); + g_HighLight_NetCode = track->GetNet(); + g_HighLight_Status = true; + GetBoard()->DrawHighLight( DrawPanel, DC, g_HighLight_NetCode ); // Prepare the Undo command DRAG_SEGM* pt_drag = g_DragSegmentList; diff --git a/pcbnew/pcbnew.cpp b/pcbnew/pcbnew.cpp index 51f32e6348..a8824714cb 100644 --- a/pcbnew/pcbnew.cpp +++ b/pcbnew/pcbnew.cpp @@ -38,7 +38,7 @@ bool g_Raccord_45_Auto = true; bool Track_45_Only; bool Segments_45_Only; bool g_TwoSegmentTrackBuild = true; -bool g_HightLigt_Status; +bool g_HighLight_Status; extern PARAM_CFG_BASE* ParamCfgList[]; int Angle_Rot_Module; @@ -49,7 +49,7 @@ int Route_Layer_BOTTOM; int g_MaxLinksShowed; int g_MagneticPadOption = capture_cursor_in_track_tool; int g_MagneticTrackOption = capture_cursor_in_track_tool; -int g_HightLigth_NetCode = -1; +int g_HighLight_NetCode = -1; wxSize ModuleTextSize; /* Default footprint texts size */ wxPoint g_Offset_Module; /* Offset de trace du modul en depl */ @@ -68,7 +68,7 @@ wxString g_DocModulesFileName = wxT("footprints_doc/footprints.pdf"); IMPLEMENT_APP( WinEDA_App ) /* MacOSX: Needed for file association - * http://wiki.wxwidgets.org/WxMac-specific_topics + * http://wiki.wxwidgets.org/WxMac-specific_topics */ void WinEDA_App::MacOpenFile(const wxString &fileName) { WinEDA_PcbFrame * frame = ((WinEDA_PcbFrame*) GetTopWindow());; diff --git a/pcbnew/pcbnew.h b/pcbnew/pcbnew.h index 7dfdcf28d1..75c0856398 100644 --- a/pcbnew/pcbnew.h +++ b/pcbnew/pcbnew.h @@ -102,9 +102,9 @@ extern bool g_TwoSegmentTrackBuild; extern int g_MagneticPadOption; extern int g_MagneticTrackOption; -/* Variables to handle hightlight nets */ -extern bool g_HightLigt_Status; -extern int g_HightLigth_NetCode; +/* Variables to handle highlight nets */ +extern bool g_HighLight_Status; +extern int g_HighLight_NetCode; extern wxPoint g_Offset_Module; /* Offset de trace du modul en depl */ diff --git a/pcbnew/pcbnew_id.h b/pcbnew/pcbnew_id.h index 6fba05f81e..c6ab9b4660 100644 --- a/pcbnew/pcbnew_id.h +++ b/pcbnew/pcbnew_id.h @@ -242,6 +242,16 @@ enum pcbnew_ids ID_PCB_MUWAVE_TOOL_FUNCTION_SHAPE_CMD, ID_PCB_MUWAVE_END_CMD, + ID_DRC_CONTROL, + ID_PCB_GLOBAL_DELETE, + ID_TRACK_BUTT, + ID_PCB_ZONES_BUTT, + ID_PCB_DELETE_ITEM_BUTT, + ID_POPUP_PCB_DELETE_TRACKSEG, + ID_TOOLBARH_PCB_SELECT_LAYER, + ID_PCB_DISPLAY_OPTIONS_SETUP, + + // ID used in module editor: ID_MODEDIT_CHECK, ID_MODEDIT_SELECT_CURRENT_LIB, ID_MODEDIT_SAVE_LIBMODULE, diff --git a/pcbnew/surbrill.cpp b/pcbnew/surbrill.cpp index dcda3024ef..09ce611bfd 100644 --- a/pcbnew/surbrill.cpp +++ b/pcbnew/surbrill.cpp @@ -76,11 +76,11 @@ void WinEDA_PcbFrame::ListNetsAndSelect( wxCommandEvent& event ) { INSTALL_DC( dc, DrawPanel ); - if( g_HightLigt_Status ) - Hight_Light( &dc ); + if( g_HighLight_Status ) + High_Light( &dc ); - g_HightLigth_NetCode = netcode; - Hight_Light( &dc ); + g_HighLight_NetCode = netcode; + High_Light( &dc ); } } @@ -90,8 +90,8 @@ void WinEDA_PcbFrame::ListNetsAndSelect( wxCommandEvent& event ) */ int WinEDA_PcbFrame::Select_High_Light( wxDC* DC ) { - if( g_HightLigt_Status ) - Hight_Light( DC ); + if( g_HighLight_Status ) + High_Light( DC ); // use this scheme because a pad is a higher priority than a track in the // search, and finding a pad, instead of a track on a pad, @@ -111,10 +111,10 @@ int WinEDA_PcbFrame::Select_High_Light( wxDC* DC ) switch( item->Type() ) { case TYPE_PAD: - g_HightLigth_NetCode = ( (D_PAD*) item )->GetNet(); - Hight_Light( DC ); + g_HighLight_NetCode = ( (D_PAD*) item )->GetNet(); + High_Light( DC ); SendMessageToEESCHEMA( item ); - return g_HightLigth_NetCode; + return g_HighLight_NetCode; case TYPE_TRACK: case TYPE_VIA: @@ -122,14 +122,14 @@ int WinEDA_PcbFrame::Select_High_Light( wxDC* DC ) // since these classes are all derived from TRACK, use a common // GetNet() function: - g_HightLigth_NetCode = ( (TRACK*) item )->GetNet(); - Hight_Light( DC ); - return g_HightLigth_NetCode; + g_HighLight_NetCode = ( (TRACK*) item )->GetNet(); + High_Light( DC ); + return g_HighLight_NetCode; case TYPE_ZONE_CONTAINER: - g_HightLigth_NetCode = ( (ZONE_CONTAINER*) item )->GetNet(); - Hight_Light( DC ); - return g_HightLigth_NetCode; + g_HighLight_NetCode = ( (ZONE_CONTAINER*) item )->GetNet(); + High_Light( DC ); + return g_HighLight_NetCode; default: ; // until somebody changes GENERAL_COLLECTOR::PadsOrTracks, @@ -146,9 +146,9 @@ int WinEDA_PcbFrame::Select_High_Light( wxDC* DC ) * * Show or removes the net at the current cursor position. */ -void WinEDA_PcbFrame::Hight_Light( wxDC* DC ) +void WinEDA_PcbFrame::High_Light( wxDC* DC ) { - g_HightLigt_Status = !g_HightLigt_Status; + g_HighLight_Status = !g_HighLight_Status; - GetBoard()->DrawHighLight( DrawPanel, DC, g_HightLigth_NetCode ); + GetBoard()->DrawHighLight( DrawPanel, DC, g_HighLight_NetCode ); } diff --git a/pcbnew/tool_pcb.cpp b/pcbnew/tool_pcb.cpp index 7f02e70e24..a3ffda1a33 100644 --- a/pcbnew/tool_pcb.cpp +++ b/pcbnew/tool_pcb.cpp @@ -377,14 +377,8 @@ void WinEDA_PcbFrame::ReCreateOptToolbar() wxITEM_CHECK ); m_OptionsToolBar->ToggleTool( ID_TB_OPTIONS_SHOW_HIGH_CONTRAST_MODE, DisplayOpt.ContrastModeDisplay ); - m_OptionsToolBar->AddTool( ID_TB_OPTIONS_SHOW_INVISIBLE_TEXT_MODE, - wxEmptyString, - wxBitmap( invisible_text_xpm ), - _( "Show invisible text" ), - wxITEM_CHECK ); - m_OptionsToolBar->ToggleTool( ID_TB_OPTIONS_SHOW_INVISIBLE_TEXT_MODE, - g_DesignSettings.IsElementVisible( MOD_TEXT_INVISIBLE )); + // Tools to show/hide toolbars: m_OptionsToolBar->AddSeparator(); m_OptionsToolBar->AddTool( ID_TB_OPTIONS_SHOW_MANAGE_LAYERS_VERTICAL_TOOLBAR, wxEmptyString, @@ -420,7 +414,7 @@ void WinEDA_PcbFrame::ReCreateVToolbar() m_VToolBar->AddSeparator(); m_VToolBar->AddTool( ID_PCB_HIGHLIGHT_BUTT, wxEmptyString, - wxBitmap( net_hightlight_xpm ), _( "Highlight net" ), + wxBitmap( net_highlight_xpm ), _( "Highlight net" ), wxITEM_CHECK ); m_VToolBar->AddTool( ID_PCB_SHOW_1_RATSNEST_BUTT, wxEmptyString, @@ -712,19 +706,29 @@ WinEDAChoiceBox* WinEDA_PcbFrame::ReCreateLayerBox( WinEDA_Toolbar* parent ) parent->AddControl( m_SelLayerBox ); } - -/* - int layer_mask = g_TabAllCopperLayerMask[g_DesignSettings.m_CopperLayerCount - 1]; - - layer_mask |= ALL_NO_CU_LAYERS; -*/ int layer_mask = g_DesignSettings.GetEnabledLayers(); unsigned length = 0; m_SelLayerBox->Clear(); - for( int layer=0, listNdx=0; layer <= EDGE_N; layer++ ) + static int layerOrder_for_display[NB_LAYERS] = { + LAYER_N_FRONT, + LAYER_N_15, LAYER_N_14, LAYER_N_13, LAYER_N_12, + LAYER_N_11, LAYER_N_10, LAYER_N_9, LAYER_N_8, + LAYER_N_7, LAYER_N_6, LAYER_N_5, LAYER_N_4, + LAYER_N_3, LAYER_N_2, + LAYER_N_BACK, + ADHESIVE_N_FRONT, ADHESIVE_N_BACK, + SOLDERPASTE_N_FRONT, SOLDERPASTE_N_BACK, + SILKSCREEN_N_FRONT, SILKSCREEN_N_BACK, + SOLDERMASK_N_FRONT, SOLDERMASK_N_BACK, + DRAW_N, COMMENT_N, + ECO1_N, ECO2_N, + EDGE_N + }; + for( int idx=0, listNdx=0; idx <= EDGE_N; idx++ ) { + int layer = layerOrder_for_display[idx]; // List to append hotkeys in layer box selection static const int HK_SwitchLayer[EDGE_N + 1] = { HK_SWITCH_LAYER_TO_COPPER, diff --git a/pcbnew/toolbars_update_user_interface.cpp b/pcbnew/toolbars_update_user_interface.cpp index e49457dadb..3006a963bf 100644 --- a/pcbnew/toolbars_update_user_interface.cpp +++ b/pcbnew/toolbars_update_user_interface.cpp @@ -266,13 +266,6 @@ void WinEDA_PcbFrame::SetToolbars() _( "Normal contrast display mode" ) : _( "High contrast display mode" ) ); - m_OptionsToolBar->ToggleTool( ID_TB_OPTIONS_SHOW_INVISIBLE_TEXT_MODE, - g_DesignSettings.IsElementVisible( MOD_TEXT_INVISIBLE ) ); - m_OptionsToolBar->SetToolShortHelp( ID_TB_OPTIONS_SHOW_INVISIBLE_TEXT_MODE, - g_DesignSettings.IsElementVisible( MOD_TEXT_INVISIBLE ) ? - _( "Hide invisible text" ) : - _( "Show invisible text" ) ); - #if !defined(KICAD_AUIMANAGER) m_OptionsToolBar->ToggleTool( ID_TB_OPTIONS_SHOW_EXTRA_VERTICAL_TOOLBAR1, (m_AuxVToolBar && m_AuxVToolBar->IsShown()) ? true : false ); diff --git a/pcbnew/tracepcb.cpp b/pcbnew/tracepcb.cpp index d97312b17f..585df89c9e 100644 --- a/pcbnew/tracepcb.cpp +++ b/pcbnew/tracepcb.cpp @@ -172,8 +172,8 @@ void BOARD::Draw( WinEDA_DrawPanel* aPanel, wxDC* DC, } // @todo: this high-light functionality could be built into me. - if( g_HightLigt_Status ) - DrawHighLight( aPanel, DC, g_HightLigth_NetCode ); + if( g_HighLight_Status ) + DrawHighLight( aPanel, DC, g_HighLight_NetCode ); // draw the BOARD's markers last, otherwise the high light will erase // any marker on a pad @@ -188,7 +188,7 @@ void BOARD::DrawHighLight( WinEDA_DrawPanel* aDrawPanel, wxDC* DC, int aNetCode { int draw_mode; - if( g_HightLigt_Status ) + if( g_HighLight_Status ) draw_mode = GR_SURBRILL | GR_OR; else draw_mode = GR_AND | GR_SURBRILL; diff --git a/pcbnew/zones_by_polygon.cpp b/pcbnew/zones_by_polygon.cpp index 456eb8d0bc..df7e8bd4e8 100644 --- a/pcbnew/zones_by_polygon.cpp +++ b/pcbnew/zones_by_polygon.cpp @@ -170,14 +170,14 @@ void WinEDA_PcbFrame::Start_Move_Zone_Corner( wxDC* DC, ZONE_CONTAINER* zone_con { if( zone_container->IsOnCopperLayer() ) /* Show the Net */ { - if( g_HightLigt_Status && DC ) + if( g_HighLight_Status && DC ) { - Hight_Light( DC ); // Remove old hightlight selection + High_Light( DC ); // Remove old hightlight selection } - g_HightLigth_NetCode = g_Zone_Default_Setting.m_NetcodeSelection = zone_container->GetNet(); + g_HighLight_NetCode = g_Zone_Default_Setting.m_NetcodeSelection = zone_container->GetNet(); if( DC ) - Hight_Light( DC ); + High_Light( DC ); } @@ -244,13 +244,13 @@ void WinEDA_PcbFrame::Start_Move_Zone_Outlines( wxDC* DC, ZONE_CONTAINER* zone_c /* Show the Net */ if( zone_container->IsOnCopperLayer() ) /* Show the Net */ { - if( g_HightLigt_Status ) + if( g_HighLight_Status ) { - Hight_Light( DC ); // Remove old hightlight selection + High_Light( DC ); // Remove old hightlight selection } - g_HightLigth_NetCode = g_Zone_Default_Setting.m_NetcodeSelection = zone_container->GetNet(); - Hight_Light( DC ); + g_HighLight_NetCode = g_Zone_Default_Setting.m_NetcodeSelection = zone_container->GetNet(); + High_Light( DC ); } s_PickedList.ClearListAndDeleteItems(); @@ -506,9 +506,9 @@ int WinEDA_PcbFrame::Begin_Zone( wxDC* DC ) DrawPanel->m_IgnoreMouseEvents = TRUE; if( zone->IsOnCopperLayer() ) { // Put a zone on a copper layer - if ( g_HightLigth_NetCode ) + if ( g_HighLight_NetCode ) { - g_Zone_Default_Setting.m_NetcodeSelection = g_HightLigth_NetCode; + g_Zone_Default_Setting.m_NetcodeSelection = g_HighLight_NetCode; zone->SetNet( g_Zone_Default_Setting.m_NetcodeSelection ); zone->SetNetNameFromNetCode( ); } @@ -549,13 +549,13 @@ int WinEDA_PcbFrame::Begin_Zone( wxDC* DC ) { if( s_CurrentZone ) g_Zone_Default_Setting.m_NetcodeSelection = s_CurrentZone->GetNet(); - if( g_HightLigt_Status ) + if( g_HighLight_Status ) { - Hight_Light( DC ); // Remove old hightlight selection + High_Light( DC ); // Remove old hightlight selection } - g_HightLigth_NetCode = g_Zone_Default_Setting.m_NetcodeSelection; - Hight_Light( DC ); + g_HighLight_NetCode = g_Zone_Default_Setting.m_NetcodeSelection; + High_Light( DC ); } if( !s_AddCutoutToCurrentZone ) s_CurrentZone = NULL; // the zone is used only once ("add similar zone" command)