From a397c4b24851e781841bcc2af84a8e57b4109b7f Mon Sep 17 00:00:00 2001 From: CHARRAS Date: Mon, 9 Jul 2007 09:29:53 +0000 Subject: [PATCH] gestfich.cpp change (A problem under windows already solved, but change was lost) --- common/gestfich.cpp | 14 +- eeschema/annotate_dialog.cpp | 69 +- eeschema/annotate_dialog.h | 14 +- eeschema/annotate_dialog.pjd | 181 ++- eeschema/class_hierarchy_sheet.cpp | 8 +- include/build_version.h | 2 +- internat/fr/kicad.mo | Bin 128791 -> 128712 bytes internat/fr/kicad.po | 2208 ++++++++++++++-------------- libs.linux | 23 +- libs.win | 6 +- news.txt | 7 + pcbnew/router.cpp | 110 +- version.txt | 4 +- 13 files changed, 1434 insertions(+), 1212 deletions(-) diff --git a/common/gestfich.cpp b/common/gestfich.cpp index 616411a48a..9ab16c2c2e 100644 --- a/common/gestfich.cpp +++ b/common/gestfich.cpp @@ -37,6 +37,7 @@ static wxString s_HelpPathList[] = { #ifdef __WINDOWS__ wxT("c:/kicad/help/"), wxT("d:/kicad/help/"), + wxT("c:/Program Files/kicad/help/"), #else wxT("/usr/share/doc/kicad/"), wxT("/usr/local/share/doc/kicad/"), @@ -52,6 +53,7 @@ static wxString s_KicadDataPathList[] = { #ifdef __WINDOWS__ wxT("c:/kicad/"), wxT("d:/kicad/"), + wxT("c:/Program Files/kicad/"), #else wxT("/usr/share/kicad/"), wxT("/usr/local/share/kicad/"), @@ -332,7 +334,11 @@ bool PathFound = FALSE; FullPath += wxT("/help/"); LocaleString = EDA_Appl->m_Locale->GetCanonicalName(); - if ( FullPath.Contains( wxT("kicad")) ) + wxString path_tmp = FullPath; +#ifdef __WINDOWS__ + path_tmp.MakeLower(); +#endif + if ( path_tmp.Contains( wxT("kicad")) ) { if ( wxDirExists(FullPath) ) PathFound = TRUE; } @@ -520,8 +526,14 @@ wxString data_path; else // Chemin cherche par le chemin des executables { // le chemin est bindir../ wxString tmp = EDA_Appl->m_BinDir; +#ifdef __WINDOWS__ + tmp.MakeLower(); +#endif if ( tmp.Contains( wxT("kicad") ) ) { +#ifdef __WINDOWS__ + tmp = EDA_Appl->m_BinDir; +#endif if ( tmp.Last() == '/' ) tmp.RemoveLast(); data_path = tmp.BeforeLast('/'); // id cd ../ data_path += UNIX_STRING_DIR_SEP; diff --git a/eeschema/annotate_dialog.cpp b/eeschema/annotate_dialog.cpp index 2247b72892..54662ce097 100644 --- a/eeschema/annotate_dialog.cpp +++ b/eeschema/annotate_dialog.cpp @@ -82,15 +82,18 @@ bool WinEDA_AnnotateFrame::Create( wxWindow* parent, wxWindowID id, const wxStri ////@begin WinEDA_AnnotateFrame member initialisation m_AnnotProjetCtrl = NULL; m_AnnotNewCmpCtrl = NULL; + m_AnnotSortCmpCtrl = NULL; ////@end WinEDA_AnnotateFrame member initialisation ////@begin WinEDA_AnnotateFrame creation - SetExtraStyle(GetExtraStyle()|wxWS_EX_BLOCK_EVENTS); + SetExtraStyle(wxWS_EX_BLOCK_EVENTS); wxDialog::Create( parent, id, caption, pos, size, style ); CreateControls(); - GetSizer()->Fit(this); - GetSizer()->SetSizeHints(this); + if (GetSizer()) + { + GetSizer()->SetSizeHints(this); + } Centre(); ////@end WinEDA_AnnotateFrame creation return true; @@ -105,7 +108,7 @@ void WinEDA_AnnotateFrame::CreateControls() SetFont(*g_DialogFont); ////@begin WinEDA_AnnotateFrame content construction - // Generated by DialogBlocks, 05/02/2006 12:40:51 (unregistered) + // Generated by DialogBlocks, 05/07/2007 21:07:04 (unregistered) WinEDA_AnnotateFrame* itemDialog1 = this; @@ -115,41 +118,41 @@ void WinEDA_AnnotateFrame::CreateControls() wxBoxSizer* itemBoxSizer3 = new wxBoxSizer(wxVERTICAL); itemBoxSizer2->Add(itemBoxSizer3, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxTOP|wxBOTTOM, 5); - wxString m_AnnotProjetCtrlStrings[] = { - _("Hierarchy"), - _("Current sheet") - }; - m_AnnotProjetCtrl = new wxRadioBox( itemDialog1, ID_RADIOBOX, _("annotate:"), wxDefaultPosition, wxDefaultSize, 2, m_AnnotProjetCtrlStrings, 1, wxRA_SPECIFY_COLS ); - itemBoxSizer3->Add(m_AnnotProjetCtrl, 0, wxALIGN_LEFT|wxALL, 5); + wxArrayString m_AnnotProjetCtrlStrings; + m_AnnotProjetCtrlStrings.Add(_("Hierarchy")); + m_AnnotProjetCtrlStrings.Add(_("Current sheet")); + m_AnnotProjetCtrl = new wxRadioBox( itemDialog1, ID_RADIOBOX, _("annotate:"), wxDefaultPosition, wxDefaultSize, m_AnnotProjetCtrlStrings, 1, wxRA_SPECIFY_COLS ); + m_AnnotProjetCtrl->SetSelection(0); + itemBoxSizer3->Add(m_AnnotProjetCtrl, 0, wxGROW|wxALL, 5); - wxString m_AnnotNewCmpCtrlStrings[] = { - _("all components"), - _("new components only") - }; - m_AnnotNewCmpCtrl = new wxRadioBox( itemDialog1, ID_RADIOBOX1, _("select items:"), wxDefaultPosition, wxDefaultSize, 2, m_AnnotNewCmpCtrlStrings, 1, wxRA_SPECIFY_COLS ); - itemBoxSizer3->Add(m_AnnotNewCmpCtrl, 0, wxALIGN_LEFT|wxALL, 5); + wxArrayString m_AnnotNewCmpCtrlStrings; + m_AnnotNewCmpCtrlStrings.Add(_("all components")); + m_AnnotNewCmpCtrlStrings.Add(_("new components only")); + m_AnnotNewCmpCtrl = new wxRadioBox( itemDialog1, ID_RADIOBOX1, _("select items:"), wxDefaultPosition, wxDefaultSize, m_AnnotNewCmpCtrlStrings, 1, wxRA_SPECIFY_COLS ); + m_AnnotNewCmpCtrl->SetSelection(0); + itemBoxSizer3->Add(m_AnnotNewCmpCtrl, 0, wxGROW|wxALL, 5); - wxString m_AnnotSortCmpCtrlStrings[] = { - _("by position"), - _("by value") - }; - m_AnnotSortCmpCtrl = new wxRadioBox( itemDialog1, ID_RADIOBOX2, _("sorting:"), wxDefaultPosition, wxDefaultSize, 2, m_AnnotSortCmpCtrlStrings, 1, wxRA_SPECIFY_COLS ); - itemBoxSizer3->Add(m_AnnotSortCmpCtrl, 0, wxALIGN_LEFT|wxALL, 5); + wxArrayString m_AnnotSortCmpCtrlStrings; + m_AnnotSortCmpCtrlStrings.Add(_("by position")); + m_AnnotSortCmpCtrlStrings.Add(_("by value")); + m_AnnotSortCmpCtrl = new wxRadioBox( itemDialog1, ID_RADIOBOX2, _("sorting:"), wxDefaultPosition, wxDefaultSize, m_AnnotSortCmpCtrlStrings, 1, wxRA_SPECIFY_COLS ); + m_AnnotSortCmpCtrl->SetSelection(0); + itemBoxSizer3->Add(m_AnnotSortCmpCtrl, 0, wxGROW|wxALL, 5); - wxBoxSizer* itemBoxSizer6 = new wxBoxSizer(wxVERTICAL); - itemBoxSizer2->Add(itemBoxSizer6, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + wxBoxSizer* itemBoxSizer7 = new wxBoxSizer(wxVERTICAL); + itemBoxSizer2->Add(itemBoxSizer7, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxButton* itemButton7 = new wxButton( itemDialog1, ID_ANNOTATE_CMP, _("&Annotate"), wxDefaultPosition, wxDefaultSize, 0 ); - itemButton7->SetDefault(); - itemButton7->SetForegroundColour(wxColour(198, 0, 0)); - itemBoxSizer6->Add(itemButton7, 0, wxGROW|wxALL, 5); + wxButton* itemButton8 = new wxButton( itemDialog1, ID_ANNOTATE_CMP, _("&Annotate"), wxDefaultPosition, wxDefaultSize, 0 ); + itemButton8->SetDefault(); + itemButton8->SetForegroundColour(wxColour(198, 0, 0)); + itemBoxSizer7->Add(itemButton8, 0, wxGROW|wxALL, 5); - wxButton* itemButton8 = new wxButton( itemDialog1, ID_DEANNOTATE_CMP, _("&Del Annotate"), wxDefaultPosition, wxDefaultSize, 0 ); - itemButton8->SetForegroundColour(wxColour(0, 0, 230)); - itemBoxSizer6->Add(itemButton8, 0, wxGROW|wxALL, 5); + wxButton* itemButton9 = new wxButton( itemDialog1, ID_DEANNOTATE_CMP, _("&Del Annotate"), wxDefaultPosition, wxDefaultSize, 0 ); + itemButton9->SetForegroundColour(wxColour(0, 0, 230)); + itemBoxSizer7->Add(itemButton9, 0, wxGROW|wxALL, 5); - wxButton* itemButton9 = new wxButton( itemDialog1, wxID_CLOSE, _("&Close"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer6->Add(itemButton9, 0, wxGROW|wxALL, 5); + wxButton* itemButton10 = new wxButton( itemDialog1, wxID_CLOSE, _("&Close"), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer7->Add(itemButton10, 0, wxGROW|wxALL, 5); ////@end WinEDA_AnnotateFrame content construction } diff --git a/eeschema/annotate_dialog.h b/eeschema/annotate_dialog.h index 8b74719866..9a334b53b8 100644 --- a/eeschema/annotate_dialog.h +++ b/eeschema/annotate_dialog.h @@ -44,16 +44,16 @@ ////@begin control identifiers #define ID_DIALOG 10000 +#define ID_RADIOBOX 10001 +#define ID_RADIOBOX1 10002 +#define ID_RADIOBOX2 10005 +#define ID_ANNOTATE_CMP 10003 +#define ID_DEANNOTATE_CMP 10004 #define SYMBOL_WINEDA_ANNOTATEFRAME_STYLE wxCAPTION|wxRESIZE_BORDER|wxSYSTEM_MENU|wxCLOSE_BOX #define SYMBOL_WINEDA_ANNOTATEFRAME_TITLE _("EESchema Annotation") #define SYMBOL_WINEDA_ANNOTATEFRAME_IDNAME ID_DIALOG -#define SYMBOL_WINEDA_ANNOTATEFRAME_SIZE wxSize(400, 500) +#define SYMBOL_WINEDA_ANNOTATEFRAME_SIZE wxSize(400, 300) #define SYMBOL_WINEDA_ANNOTATEFRAME_POSITION wxDefaultPosition -#define ID_RADIOBOX 10001 -#define ID_RADIOBOX1 10002 -#define ID_RADIOBOX2 10003 -#define ID_ANNOTATE_CMP 10004 -#define ID_DEANNOTATE_CMP 10005 ////@end control identifiers /*! @@ -112,7 +112,7 @@ public: ////@begin WinEDA_AnnotateFrame member variables wxRadioBox* m_AnnotProjetCtrl; wxRadioBox* m_AnnotNewCmpCtrl; - wxRadioBox* m_AnnotSortCmpCtrl; + wxRadioBox* m_AnnotSortCmpCtrl; ////@end WinEDA_AnnotateFrame member variables WinEDA_SchematicFrame * m_Parent; diff --git a/eeschema/annotate_dialog.pjd b/eeschema/annotate_dialog.pjd index cebd17f3d0..91aee1d0b2 100644 --- a/eeschema/annotate_dialog.pjd +++ b/eeschema/annotate_dialog.pjd @@ -1,4 +1,4 @@ - +
0 @@ -6,7 +6,6 @@ "" "" "" - 16 "" 0 0 @@ -18,6 +17,7 @@ "License GNU" "" 0 + 0 "<All platforms>" "<Any>" "///////////////////////////////////////////////////////////////////////////// @@ -43,12 +43,6 @@ // Licence: ///////////////////////////////////////////////////////////////////////////// -" - " -/*! - * %BODY% - */ - " "///////////////////////////////////////////////////////////////////////////// // Name: %SYMBOLS-FILENAME% @@ -82,6 +76,14 @@ #include "wx/wx.h" #endif +" + " /// %BODY% +" + " +/*! + * %BODY% + */ + " "app_resources.h" "app_resources.cpp" @@ -93,11 +95,21 @@ "" "<None>" "<System>" + "utf-8" "<System>" "" + 0 + 0 + 4 + " " + "" 0 + 0 + 1 1 1 + 0 + 1
@@ -120,6 +132,47 @@ 0 "" 1 + "" + "Debug" + "ANSI" + "Static" + "Modular" + "GUI" + "wxMSW" + "Dynamic" + "Yes" + "No" + "No" + "%WXVERSION%" + "%EXECUTABLE%" + "" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" @@ -133,7 +186,7 @@ 1 1 0 - 0 + 1 "Windows" "html-document" @@ -157,6 +210,8 @@ 10000 0 "" + 0 + "" 0 "ID_DIALOG" 10000 @@ -196,7 +251,9 @@ 0 0 0 - 0 + 0 + 0 + 0 0 0 1 @@ -208,6 +265,7 @@ -1 400 300 + 0 "" "wxBoxSizer H" @@ -264,9 +322,16 @@ "ID_RADIOBOX" 10001 "wxRadioBox" + "wxRadioBox" + 1 + 0 + "" + "" "m_AnnotProjetCtrl" "annotate:" 1 + "Hierarchy|Current sheet" + 0 "" "" "" @@ -279,14 +344,15 @@ "" 0 1 - "Hierarchy|Current sheet" 0 + 0 + 0 "" -1 -1 -1 -1 - "Left" + "Expand" "Centre" 0 5 @@ -314,9 +380,16 @@ "ID_RADIOBOX1" 10002 "wxRadioBox" + "wxRadioBox" + 1 + 0 + "" + "" "m_AnnotNewCmpCtrl" "select items:" 1 + "all components|new components only" + 0 "" "" "" @@ -329,14 +402,73 @@ "" 0 1 - "all components|new components only" 0 + 0 + 0 "" -1 -1 -1 -1 - "Left" + "Expand" + "Centre" + 0 + 5 + 1 + 1 + 1 + 1 + 0 + 0 + 0 + "" + "" + + + "wxRadioBox: ID_RADIOBOX2" + "dialog-control-document" + "" + "radiobox" + 0 + 1 + 0 + 0 + "5/7/2007" + "wbRadioBoxProxy" + "ID_RADIOBOX2" + 10005 + "wxRadioBox" + "wxRadioBox" + 1 + 0 + "" + "" + "m_AnnotSortCmpCtrl" + "sorting:" + 1 + "by position|by value" + 0 + "" + "" + "" + "" + "" + 0 + 1 + "<Any platform>" + "" + "" + 0 + 1 + 0 + 0 + 0 + "" + -1 + -1 + -1 + -1 + "Expand" "Centre" 0 5 @@ -391,6 +523,11 @@ "ID_ANNOTATE_CMP" 10003 "wxButton" + "wxButton" + 1 + 0 + "" + "" "" "&Annotate" 1 @@ -409,6 +546,8 @@ 0 0 0 + 0 + 0 "" -1 -1 @@ -443,6 +582,11 @@ "ID_DEANNOTATE_CMP" 10004 "wxButton" + "wxButton" + 1 + 0 + "" + "" "" "&Del Annotate" 0 @@ -461,6 +605,8 @@ 0 0 0 + 0 + 0 "" -1 -1 @@ -495,6 +641,11 @@ "wxID_CLOSE" 5001 "wxButton" + "wxButton" + 1 + 0 + "" + "" "" "&Close" 0 @@ -513,6 +664,8 @@ 0 0 0 + 0 + 0 "" -1 -1 diff --git a/eeschema/class_hierarchy_sheet.cpp b/eeschema/class_hierarchy_sheet.cpp index 85bcaf77f7..9f6fe8e854 100644 --- a/eeschema/class_hierarchy_sheet.cpp +++ b/eeschema/class_hierarchy_sheet.cpp @@ -162,7 +162,7 @@ int LineWidth = g_DrawMinimunLineWidth; GRRect(&panel->m_ClipBox, DC, pos.x, pos.y, pos.x + m_Size.x, pos.y + m_Size.y, LineWidth, color); - /* Trace des textes : SheetName */ + /* Draw text : SheetName */ if( Color > 0 ) txtcolor = Color; else txtcolor = ReturnLayerColor(LAYER_SHEETNAME); @@ -172,7 +172,7 @@ int LineWidth = g_DrawMinimunLineWidth; Text, TEXT_ORIENT_HORIZ, wxSize(m_SheetNameSize,m_SheetNameSize), GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_VJUSTIFY_BOTTOM, LineWidth); - /* Trace des textes : FileName */ + /* Draw text : FileName */ if( Color >= 0 ) txtcolor = Color; else txtcolor = ReturnLayerColor(LAYER_SHEETFILENAME); Text = wxT("File: ") + m_FileName; @@ -183,7 +183,7 @@ int LineWidth = g_DrawMinimunLineWidth; GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_VJUSTIFY_TOP, LineWidth); - /* Trace des textes : SheetLabel */ + /* Draw text : SheetLabel */ SheetLabelStruct = m_Label; while( SheetLabelStruct != NULL ) { @@ -193,7 +193,7 @@ int LineWidth = g_DrawMinimunLineWidth; } -/************************/ + /************************/ /* DrawSheetLabelStruct */ /************************/ diff --git a/include/build_version.h b/include/build_version.h index 54262a2e82..6999641478 100644 --- a/include/build_version.h +++ b/include/build_version.h @@ -5,7 +5,7 @@ COMMON_GLOBL wxString g_BuildVersion #ifdef EDA_BASE - (wxT("(2007-07-02)")) + (wxT("(2007-07-09)")) #endif ; diff --git a/internat/fr/kicad.mo b/internat/fr/kicad.mo index 4d6cb1236d9509df382211380a46c699098afc9e..5fdb36b91611b7463116497d73cba78b570bcb49 100644 GIT binary patch delta 46857 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 O8?{yDQDs`ynEwDP&!pb~ delta 46878 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 L=XknSyAbyuaZ|7N diff --git a/internat/fr/kicad.po b/internat/fr/kicad.po index 784e0388c5..208611c9e2 100644 --- a/internat/fr/kicad.po +++ b/internat/fr/kicad.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: kicad\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2007-07-01 21:10+0100\n" -"Last-Translator: \n" +"PO-Revision-Date: 2007-07-09 11:49+0100\n" +"Last-Translator: jp charras \n" "Language-Team: kicad team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" @@ -1298,191 +1298,321 @@ msgstr "Valeur incorrecte pour per msgid "Delete Pad (module %s %s) " msgstr "Effacer Pad (module %s %s) " -#: pcbnew/gendrill.cpp:146 -msgid "Drill tools" -msgstr "Outils de perçage" - -#: pcbnew/gendrill.cpp:167 -#: pcbnew/dialog_general_options.cpp:271 -#: eeschema/options.cpp:185 -#: gerbview/options.cpp:192 -msgid "millimeters" -msgstr "millimetres" - -#: pcbnew/gendrill.cpp:167 -#: eeschema/dialog_options.cpp:246 -#: eeschema/options.cpp:185 -msgid "inches" -msgstr "Pouces" - -#: pcbnew/gendrill.cpp:169 -msgid "Drill Units:" -msgstr "Unités perçage:" - -#: pcbnew/gendrill.cpp:176 -msgid "decimal format" -msgstr "Format décimal" - -#: pcbnew/gendrill.cpp:177 -msgid "suppress leading zeros" -msgstr "Suppression zeros de tête" - -#: pcbnew/gendrill.cpp:177 -msgid "suppress trailing zeros" -msgstr "Suppression zeros de fin" - -#: pcbnew/gendrill.cpp:177 -msgid "keep zeros" -msgstr "Garder les zéros" - -#: pcbnew/gendrill.cpp:180 -msgid "Zeros Format" -msgstr "Format des zéros" - -#: pcbnew/gendrill.cpp:187 -#: pcbnew/gendrill.cpp:429 -msgid "2:3" -msgstr "2:3" - -#: pcbnew/gendrill.cpp:187 -#: pcbnew/gendrill.cpp:430 -msgid "2:4" -msgstr "2:4" - -#: pcbnew/gendrill.cpp:188 -#: pcbnew/gendrill.cpp:434 -msgid "3:2" -msgstr "3:2" - -#: pcbnew/gendrill.cpp:188 -#: pcbnew/gendrill.cpp:435 -msgid "3:3" -msgstr "3:3" - -#: pcbnew/gendrill.cpp:194 -msgid "Precision" -msgstr "Précision" - -#: pcbnew/gendrill.cpp:207 -msgid "Drill Origine:" -msgstr "Origine des coord de percage" - -#: pcbnew/gendrill.cpp:215 -#: pcbnew/gendrill.cpp:223 -#: eeschema/libedit.cpp:41 -#: eeschema/viewlibs.cpp:119 -msgid "None" -msgstr "Aucun" - -#: pcbnew/gendrill.cpp:215 -msgid "drill sheet (HPGL)" -msgstr "Plan de perçage (HPGL)" - -#: pcbnew/gendrill.cpp:215 -msgid "drill sheet (Postscript)" -msgstr "Plan de perçage (Postscript)" - -#: pcbnew/gendrill.cpp:217 -msgid "Drill Sheet:" -msgstr "Plan de perçage:" - -#: pcbnew/gendrill.cpp:223 -msgid "Drill report" -msgstr "Plan de perçage" - -#: pcbnew/gendrill.cpp:225 -msgid "Drill Report:" -msgstr "Plan de perçage:" - -#: pcbnew/gendrill.cpp:230 -msgid "Via Drill" -msgstr "Perçage des vias" - -#: pcbnew/gendrill.cpp:234 -#: eeschema/plothpgl.cpp:239 -msgid "Pen Number" -msgstr "Numéro de plume" - -#: pcbnew/gendrill.cpp:237 -msgid "Speed(cm/s)" -msgstr "Vitesse plume ( cm/s )" - -#: pcbnew/gendrill.cpp:240 -msgid "mirror y axis" -msgstr "Miroir sur axe Y" - -#: pcbnew/gendrill.cpp:244 -msgid "minimal header" -msgstr "Entête minimal" - -#: pcbnew/gendrill.cpp:250 -msgid "&Execute" -msgstr "&Exécuter" - -#: pcbnew/gendrill.cpp:254 -#: pcbnew/dialog_netlist.cpp:178 -#: pcbnew/dialog_drc.cpp:164 -#: eeschema/plotps.cpp:207 -#: eeschema/netlist_control.cpp:124 -#: eeschema/netlist_control.cpp:275 -#: eeschema/dialog_edit_label.cpp:181 -#: eeschema/dialog_edit_component_in_schematic.cpp:235 -#: eeschema/annotate_dialog.cpp:151 -#: common/svg_print.cpp:220 -#: share/svg_print.cpp:222 -#: share/dialog_print.cpp:225 -msgid "&Close" -msgstr "&Fermer" - -#: pcbnew/gendrill.cpp:367 -msgid "Drill file" -msgstr "Fichier de percage" - -#: pcbnew/gendrill.cpp:381 -#: pcbnew/gendrill.cpp:1419 -#: pcbnew/xchgmod.cpp:599 -#: pcbnew/plotps.cpp:47 -msgid "Unable to create file " -msgstr "Impossible de créer le fichier " - -#: pcbnew/gendrill.cpp:388 -#: pcbnew/gendrill.cpp:939 -#: pcbnew/plotgerb.cpp:83 -#: pcbnew/plothpgl.cpp:72 -#: pcbnew/plotps.cpp:53 -msgid "File" -msgstr "Fichier" - -#: pcbnew/gendrill.cpp:394 -#: pcbnew/gendrill.cpp:944 -msgid "Tools" -msgstr "Outils" - -#: pcbnew/gendrill.cpp:398 -#: pcbnew/gendrill.cpp:1010 -#: pcbnew/class_pad.cpp:791 -#: pcbnew/affiche.cpp:208 -#: pcbnew/affiche.cpp:210 -msgid "Drill" -msgstr "Perçage" - -#: pcbnew/gendrill.cpp:875 -#: pcbnew/gendrill.cpp:1405 -msgid "Drill Map file" -msgstr "Fichier Plan de perçage" - -#: pcbnew/gendrill.cpp:933 -#, c-format -msgid "Unable to create file <%s>" -msgstr "Impossible de créer fichier <%s>" - -#: pcbnew/gendrill.cpp:1182 +#: pcbnew/tool_pcb.cpp:49 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" +"Show active layer selections\n" +"and select layer pair for route and place via" 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 " +"Affiche selections couche active\n" +"et selection paire de couches pour routage and placement via" + +#: pcbnew/tool_pcb.cpp:219 +msgid "New Board" +msgstr "Nouveau Circuit Imprimé" + +#: pcbnew/tool_pcb.cpp:220 +msgid "Open existing Board" +msgstr "Ouvrir C.I. existant" + +#: pcbnew/tool_pcb.cpp:221 +msgid "Save Board" +msgstr "Sauver Circuit Imprimé" + +#: pcbnew/tool_pcb.cpp:224 +#: eeschema/tool_sch.cpp:61 +#: gerbview/tool_gerber.cpp:217 +msgid "page settings (size, texts)" +msgstr "Ajustage de la feuille de dessin (dimensions, textes)" + +#: pcbnew/tool_pcb.cpp:228 +msgid "Open Module Editor" +msgstr "Ouvrir Editeur de modules" + +#: pcbnew/tool_pcb.cpp:231 +#: eeschema/tool_sch.cpp:77 +#: gerbview/tool_gerber.cpp:228 +msgid "Cut selected item" +msgstr "Suppression des éléments sélectionnés" + +#: pcbnew/tool_pcb.cpp:234 +#: eeschema/tool_sch.cpp:80 +#: gerbview/tool_gerber.cpp:233 +msgid "Copy selected item" +msgstr "Copie des éléments sélectionnés" + +#: pcbnew/tool_pcb.cpp:236 +#: eeschema/tool_sch.cpp:83 +#: gerbview/tool_gerber.cpp:239 +msgid "Paste" +msgstr "Copie des éléments sauvegardés" + +#: pcbnew/tool_pcb.cpp:239 +#: gerbview/tool_gerber.cpp:246 +msgid "Undelete" +msgstr "Annulation du dernier effacement" + +#: pcbnew/tool_pcb.cpp:242 +msgid "Print Board" +msgstr "Imprimer C.I." + +#: pcbnew/tool_pcb.cpp:243 +#: pcbnew/menubarpcb.cpp:93 +msgid "Plot (HPGL, PostScript, or GERBER format)" +msgstr "Tracer en format HPGL, POSTSCRIPT ou GERBER" + +#: pcbnew/tool_pcb.cpp:246 +#: pcbnew/tool_modedit.cpp:111 +#: eeschema/tool_sch.cpp:104 +#: eeschema/tool_lib.cpp:170 +#: eeschema/tool_viewlib.cpp:70 +#: cvpcb/displayframe.cpp:118 +#: gerbview/tool_gerber.cpp:260 +#: 3d-viewer/3d_toolbar.cpp:43 +msgid "zoom + (F1)" +msgstr "zoom + (F1)" + +#: pcbnew/tool_pcb.cpp:247 +#: pcbnew/tool_modedit.cpp:114 +#: eeschema/tool_sch.cpp:107 +#: eeschema/tool_lib.cpp:174 +#: eeschema/tool_viewlib.cpp:74 +#: cvpcb/displayframe.cpp:121 +#: gerbview/tool_gerber.cpp:266 +#: 3d-viewer/3d_toolbar.cpp:46 +msgid "zoom - (F2)" +msgstr "zoom - (F2)" + +#: pcbnew/tool_pcb.cpp:248 +#: pcbnew/tool_modedit.cpp:117 +#: eeschema/tool_sch.cpp:110 +#: eeschema/tool_lib.cpp:178 +#: eeschema/tool_viewlib.cpp:78 +#: cvpcb/displayframe.cpp:124 +#: gerbview/tool_gerber.cpp:272 +#: 3d-viewer/3d_toolbar.cpp:49 +msgid "redraw (F3)" +msgstr "Redessin (F3)" + +#: pcbnew/tool_pcb.cpp:250 +#: pcbnew/tool_modedit.cpp:120 +#: eeschema/tool_sch.cpp:113 +#: eeschema/tool_lib.cpp:182 +#: gerbview/tool_gerber.cpp:278 +#: 3d-viewer/3d_toolbar.cpp:52 +msgid "auto zoom" +msgstr "Zoom automatique" + +#: pcbnew/tool_pcb.cpp:253 +msgid "Find components and texts (Ctrl-F)" +msgstr "Recherche de composants et textes (Ctrl F)" + +#: pcbnew/tool_pcb.cpp:256 +msgid "Read Netlist" +msgstr "Lire Netliste" + +#: pcbnew/tool_pcb.cpp:257 +msgid "Pcb Design Rules Check" +msgstr "Controle des règles de conception" + +#: pcbnew/tool_pcb.cpp:267 +msgid "Mode Module: Manual and Automatic Move or Place for modules" +msgstr "Mode Module: Déplacements ou Placement Manuel ou Automatique des modules" + +#: pcbnew/tool_pcb.cpp:269 +msgid "Mode Track and Autorouting" +msgstr "Mode Pistes and Autoroutage" + +#: pcbnew/tool_pcb.cpp:291 +msgid "Drc OFF" +msgstr "Drc DESACTIVEE" + +#: pcbnew/tool_pcb.cpp:293 +#: pcbnew/tool_modedit.cpp:201 +#: eeschema/tool_sch.cpp:246 +#: gerbview/tool_gerber.cpp:389 +msgid "Display Grid OFF" +msgstr "Suppression de l'affichage de la grille" + +#: pcbnew/tool_pcb.cpp:295 +#: pcbnew/tool_modedit.cpp:205 +#: gerbview/tool_gerber.cpp:395 +msgid "Display Polar Coord ON" +msgstr "Activer affichage coord Polaires" + +#: pcbnew/tool_pcb.cpp:297 +#: pcbnew/tool_modedit.cpp:209 +#: eeschema/tool_sch.cpp:250 +#: gerbview/tool_gerber.cpp:399 +msgid "Units = Inch" +msgstr "Unités = pouce" + +#: pcbnew/tool_pcb.cpp:299 +#: pcbnew/tool_modedit.cpp:213 +#: eeschema/tool_sch.cpp:254 +#: gerbview/tool_gerber.cpp:403 +msgid "Units = mm" +msgstr "Unités = mm" + +#: pcbnew/tool_pcb.cpp:301 +#: pcbnew/tool_modedit.cpp:219 +#: eeschema/tool_sch.cpp:258 +#: gerbview/tool_gerber.cpp:409 +msgid "Change Cursor Shape" +msgstr "Sélection de la forme du curseur" + +#: pcbnew/tool_pcb.cpp:306 +msgid "Show General Ratsnest" +msgstr "Monter le chevelu général" + +#: pcbnew/tool_pcb.cpp:309 +msgid "Show Module Ratsnest when moving" +msgstr "Monter le chevelu du module pendant déplacement" + +#: pcbnew/tool_pcb.cpp:313 +msgid "Enable Auto Del Track" +msgstr "Autoriser l'effacement automatique des pistes" + +#: pcbnew/tool_pcb.cpp:317 +#: pcbnew/pcbframe.cpp:384 +#: pcbnew/set_color.cpp:387 +msgid "Show Zones" +msgstr "Monter Zones" + +#: pcbnew/tool_pcb.cpp:322 +#: pcbnew/tool_modedit.cpp:227 +msgid "Show Pads Sketch" +msgstr "Afficher pastilles en contour" + +#: pcbnew/tool_pcb.cpp:326 +msgid "Show Tracks Sketch" +msgstr "Afficher pistes en contour" + +#: pcbnew/tool_pcb.cpp:330 +#: pcbnew/pcbframe.cpp:399 +msgid "Hight Contrast Mode Display" +msgstr "Mode d'affichage Haut Contraste" + +#: pcbnew/tool_pcb.cpp:338 +msgid "" +"Display auxiliary vertical toolbar (tools for micro wave applications)\n" +" This is a very experimental feature (under development)" +msgstr "" +"Affiche toolbar vertical auxiliaire (outils pour applications micro-ondes)\n" +"C'est un outil expérimental (en cours de développement)" + +#: pcbnew/tool_pcb.cpp:364 +msgid "Net highlight" +msgstr "Surbrillance des équipotentielles" + +#: pcbnew/tool_pcb.cpp:368 +msgid "Display local ratsnest (pad or module)" +msgstr "Afficher le chevelu local (pastilles ou modules)" + +#: pcbnew/tool_pcb.cpp:373 +msgid "Add modules" +msgstr "Addition de Modules" + +#: pcbnew/tool_pcb.cpp:377 +msgid "Add Tracks an vias" +msgstr "Ajouter pistes et vias" + +#: pcbnew/tool_pcb.cpp:381 +#: pcbnew/edit.cpp:529 +msgid "Add Zones" +msgstr "Addition de Zones" + +#: pcbnew/tool_pcb.cpp:386 +#: pcbnew/tool_modedit.cpp:158 +#: eeschema/tool_sch.cpp:216 +msgid "Add graphic line or polygon" +msgstr "Addition de lignes ou polygones graphiques" + +#: pcbnew/tool_pcb.cpp:390 +#: pcbnew/tool_modedit.cpp:162 +msgid "Add graphic circle" +msgstr "Addition de graphiques (Cercle)" + +#: pcbnew/tool_pcb.cpp:394 +#: pcbnew/tool_modedit.cpp:166 +msgid "Add graphic arc" +msgstr "Addition de graphiques (Arc de Cercle)" + +#: pcbnew/tool_pcb.cpp:398 +#: pcbnew/edit.cpp:552 +#: pcbnew/tool_modedit.cpp:170 +#: eeschema/schedit.cpp:309 +#: eeschema/libframe.cpp:487 +#: gerbview/tool_gerber.cpp:361 +msgid "Add Text" +msgstr "Ajout de Texte" + +#: pcbnew/tool_pcb.cpp:403 +#: pcbnew/edit.cpp:560 +msgid "Add Cotation" +msgstr "Addition de Cotations" + +#: pcbnew/tool_pcb.cpp:407 +#: gerbview/tool_gerber.cpp:354 +msgid "Add Mires" +msgstr "Addition de Mires de superposition" + +#: pcbnew/tool_pcb.cpp:412 +#: pcbnew/tool_modedit.cpp:180 +#: eeschema/tool_sch.cpp:225 +#: eeschema/tool_lib.cpp:92 +#: gerbview/tool_gerber.cpp:369 +msgid "Delete items" +msgstr "Suppression d'éléments" + +#: pcbnew/tool_pcb.cpp:417 +msgid "Offset adjust for drill and place files" +msgstr "Ajuste offset pour fichier de perçage et placement" + +#: pcbnew/tool_pcb.cpp:440 +msgid "Create line of specified length for microwave applications" +msgstr "Creation de lignes de longueur spécifiée (pour applications micro-ondes)" + +#: pcbnew/tool_pcb.cpp:446 +msgid "Create gap of specified length for microwave applications" +msgstr "Creation de gaps de longueur spécifiée (pour applications micro-ondes)" + +#: pcbnew/tool_pcb.cpp:454 +msgid "Create stub of specified length for microwave applications" +msgstr "Creation de stub de longueur spécifiée (pour applications micro-ondes)" + +#: pcbnew/tool_pcb.cpp:460 +msgid "Create stub (arc) of specified length for microwave applications" +msgstr "Creation de stub (arc) de longueur spécifiée (pour applications micro-ondes)" + +#: pcbnew/tool_pcb.cpp:466 +msgid "Create a polynomial shape for microwave applications" +msgstr "Creation de formes polynomiales (pour applications micro-ondes)" + +#: pcbnew/tool_pcb.cpp:512 +#: pcbnew/tool_modedit.cpp:273 +#: eeschema/plotps.cpp:168 +#: share/zoom.cpp:353 +msgid "Auto" +msgstr "Auto" + +#: pcbnew/tool_pcb.cpp:516 +msgid "Zoom " +msgstr "Zoom " + +#: pcbnew/tool_pcb.cpp:529 +#: pcbnew/set_color.cpp:378 +#: gerbview/set_color.h:246 +msgid "Grid" +msgstr "Grille" + +#: pcbnew/tool_pcb.cpp:542 +#: pcbnew/tool_modedit.cpp:299 +msgid "User Grid" +msgstr "Grille perso" + +#: pcbnew/tool_pcb.cpp:591 +msgid "+/- to switch" +msgstr "+/- pour commuter" #: pcbnew/dialog_netlist.cpp:133 #: eeschema/edit_component_in_schematic.cpp:682 @@ -1554,6 +1684,21 @@ msgstr "Test Modules" msgid "Compile" msgstr "Compile" +#: pcbnew/dialog_netlist.cpp:178 +#: pcbnew/dialog_drc.cpp:164 +#: pcbnew/gendrill.cpp:254 +#: eeschema/plotps.cpp:207 +#: eeschema/netlist_control.cpp:124 +#: eeschema/netlist_control.cpp:275 +#: eeschema/dialog_edit_label.cpp:181 +#: eeschema/dialog_edit_component_in_schematic.cpp:235 +#: eeschema/annotate_dialog.cpp:154 +#: common/svg_print.cpp:220 +#: share/svg_print.cpp:222 +#: share/dialog_print.cpp:225 +msgid "&Close" +msgstr "&Fermer" + #: pcbnew/dialog_edit_mod_text.cpp:156 #, c-format msgid "Module %s (%s) orient %.1f" @@ -1935,6 +2080,14 @@ msgstr "Taille H" msgid "V Size" msgstr "Taille V" +#: pcbnew/class_pad.cpp:791 +#: pcbnew/affiche.cpp:208 +#: pcbnew/affiche.cpp:210 +#: pcbnew/gendrill.cpp:398 +#: pcbnew/gendrill.cpp:1010 +msgid "Drill" +msgstr "Perçage" + #: pcbnew/class_pad.cpp:799 msgid "Drill X / Y" msgstr "Perçage X/Y" @@ -2702,10 +2855,10 @@ msgid "Pads Global Edit" msgstr "Pads: Edition globale" #: pcbnew/globaleditpad.cpp:96 +#: pcbnew/menubarpcb.cpp:205 #: pcbnew/menubarmodedit.cpp:45 #: pcbnew/tool_modedit.cpp:125 #: pcbnew/modedit.cpp:365 -#: pcbnew/menubarpcb.cpp:205 msgid "Pad Settings" msgstr "Caract pads" @@ -2809,11 +2962,11 @@ msgstr "Propri msgid "Layer:" msgstr "Couche:" -#: pcbnew/router.cpp:66 +#: pcbnew/router.cpp:60 msgid "Unable to create temporary file " msgstr "Impossible de créer le fichier temporaire " -#: pcbnew/router.cpp:71 +#: pcbnew/router.cpp:65 msgid "Create temporary file " msgstr "Creation fichier temporaire " @@ -3374,6 +3527,537 @@ msgstr "Change module %s (%s) " msgid "Cmp files:" msgstr "Fichiers Cmp: " +#: pcbnew/xchgmod.cpp:599 +#: pcbnew/gendrill.cpp:381 +#: pcbnew/gendrill.cpp:1419 +#: pcbnew/plotps.cpp:47 +msgid "Unable to create file " +msgstr "Impossible de créer le fichier " + +#: pcbnew/gendrill.cpp:146 +msgid "Drill tools" +msgstr "Outils de perçage" + +#: pcbnew/gendrill.cpp:167 +#: pcbnew/dialog_general_options.cpp:271 +#: eeschema/options.cpp:185 +#: gerbview/options.cpp:192 +msgid "millimeters" +msgstr "millimetres" + +#: pcbnew/gendrill.cpp:167 +#: eeschema/dialog_options.cpp:246 +#: eeschema/options.cpp:185 +msgid "inches" +msgstr "Pouces" + +#: pcbnew/gendrill.cpp:169 +msgid "Drill Units:" +msgstr "Unités perçage:" + +#: pcbnew/gendrill.cpp:176 +msgid "decimal format" +msgstr "Format décimal" + +#: pcbnew/gendrill.cpp:177 +msgid "suppress leading zeros" +msgstr "Suppression zeros de tête" + +#: pcbnew/gendrill.cpp:177 +msgid "suppress trailing zeros" +msgstr "Suppression zeros de fin" + +#: pcbnew/gendrill.cpp:177 +msgid "keep zeros" +msgstr "Garder les zéros" + +#: pcbnew/gendrill.cpp:180 +msgid "Zeros Format" +msgstr "Format des zéros" + +#: pcbnew/gendrill.cpp:187 +#: pcbnew/gendrill.cpp:429 +msgid "2:3" +msgstr "2:3" + +#: pcbnew/gendrill.cpp:187 +#: pcbnew/gendrill.cpp:430 +msgid "2:4" +msgstr "2:4" + +#: pcbnew/gendrill.cpp:188 +#: pcbnew/gendrill.cpp:434 +msgid "3:2" +msgstr "3:2" + +#: pcbnew/gendrill.cpp:188 +#: pcbnew/gendrill.cpp:435 +msgid "3:3" +msgstr "3:3" + +#: pcbnew/gendrill.cpp:194 +msgid "Precision" +msgstr "Précision" + +#: pcbnew/gendrill.cpp:207 +msgid "Drill Origin:" +msgstr "Origine des coord de percage:" + +#: pcbnew/gendrill.cpp:215 +#: pcbnew/gendrill.cpp:223 +#: eeschema/libedit.cpp:41 +#: eeschema/viewlibs.cpp:119 +msgid "None" +msgstr "Aucun" + +#: pcbnew/gendrill.cpp:215 +msgid "drill sheet (HPGL)" +msgstr "Plan de perçage (HPGL)" + +#: pcbnew/gendrill.cpp:215 +msgid "drill sheet (PostScript)" +msgstr "Plan de perçage (Postscript)" + +#: pcbnew/gendrill.cpp:217 +msgid "Drill Sheet:" +msgstr "Plan de perçage:" + +#: pcbnew/gendrill.cpp:223 +msgid "Drill report" +msgstr "Plan de perçage" + +#: pcbnew/gendrill.cpp:225 +msgid "Drill Report:" +msgstr "Plan de perçage:" + +#: pcbnew/gendrill.cpp:230 +msgid "Via Drill" +msgstr "Perçage des vias" + +#: pcbnew/gendrill.cpp:234 +#: eeschema/plothpgl.cpp:239 +msgid "Pen Number" +msgstr "Numéro de plume" + +#: pcbnew/gendrill.cpp:237 +msgid "Speed (cm/s)" +msgstr "Vitesse plume ( cm/s )" + +#: pcbnew/gendrill.cpp:240 +msgid "mirror y axis" +msgstr "Miroir sur axe Y" + +#: pcbnew/gendrill.cpp:244 +msgid "minimal header" +msgstr "Entête minimal" + +#: pcbnew/gendrill.cpp:250 +msgid "&Execute" +msgstr "&Exécuter" + +#: pcbnew/gendrill.cpp:367 +msgid "Drill file" +msgstr "Fichier de percage" + +#: pcbnew/gendrill.cpp:388 +#: pcbnew/gendrill.cpp:939 +#: pcbnew/plotgerb.cpp:83 +#: pcbnew/plothpgl.cpp:72 +#: pcbnew/plotps.cpp:53 +msgid "File" +msgstr "Fichier" + +#: pcbnew/gendrill.cpp:394 +#: pcbnew/gendrill.cpp:944 +msgid "Tools" +msgstr "Outils" + +#: pcbnew/gendrill.cpp:875 +#: pcbnew/gendrill.cpp:1405 +msgid "Drill Map file" +msgstr "Fichier Plan de perçage" + +#: pcbnew/gendrill.cpp:933 +#, c-format +msgid "Unable to create file <%s>" +msgstr "Impossible de créer fichier <%s>" + +#: pcbnew/gendrill.cpp:1182 +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" +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/menubarpcb.cpp:41 +msgid "Load Board Ctrl-O" +msgstr "Charger Circuit Imprimé (Ctrl O)" + +#: pcbnew/menubarpcb.cpp:42 +msgid "Delete old Board and Load new Board" +msgstr "Effacer ancien C.I. et charger un nouveau" + +#: pcbnew/menubarpcb.cpp:47 +msgid "Append Board" +msgstr "Ajouter Circuit Imprimé" + +#: pcbnew/menubarpcb.cpp:48 +msgid "Add Board to old Board" +msgstr "Ajouter un C.I. au C.I. actuel" + +#: pcbnew/menubarpcb.cpp:53 +msgid "&New board" +msgstr "&Nouveau Circuit Imprimé" + +#: pcbnew/menubarpcb.cpp:54 +msgid "Clear old PCB and init a new one" +msgstr "Effacer C.I. ancien et créer un nouveau" + +#: pcbnew/menubarpcb.cpp:59 +msgid "&Rescue" +msgstr "&Secours" + +#: pcbnew/menubarpcb.cpp:60 +msgid "Clear old board and get last rescue file" +msgstr "Effacer C.I. actuel et reprendre dernier fichier secours" + +#: pcbnew/menubarpcb.cpp:65 +msgid "&Previous version" +msgstr "&Précédente version" + +#: pcbnew/menubarpcb.cpp:66 +msgid "Clear old board and get old version of board" +msgstr "Effacer C.I. actuel et reprendre ancienne version" + +#: pcbnew/menubarpcb.cpp:73 +msgid "&Save board Ctrl-S" +msgstr "Sauver Circuit Imprimé (Ctrl S)" + +#: pcbnew/menubarpcb.cpp:74 +msgid "Save current board" +msgstr "Sauver le C.I. actuel" + +#: pcbnew/menubarpcb.cpp:79 +msgid "Save Board as.." +msgstr "Sauver C.I. sous.." + +#: pcbnew/menubarpcb.cpp:80 +msgid "Save current board as.." +msgstr "Sauver le Circuit Imprimé courant sous.." + +#: pcbnew/menubarpcb.cpp:87 +#: eeschema/menubar.cpp:70 +#: gerbview/tool_gerber.cpp:86 +msgid "P&rint" +msgstr "Imp&rimer" + +#: pcbnew/menubarpcb.cpp:87 +#: eeschema/menubar.cpp:70 +#: gerbview/tool_gerber.cpp:86 +msgid "Print on current printer" +msgstr "Imprimer sur l'imprimante par défaut" + +#: pcbnew/menubarpcb.cpp:92 +#: eeschema/menubar.cpp:100 +msgid "&Plot" +msgstr "&Tracer" + +#: pcbnew/menubarpcb.cpp:101 +msgid "&GenCAD" +msgstr "&GenCAD" + +#: pcbnew/menubarpcb.cpp:101 +msgid "Export GenCAD Format" +msgstr "Exporter en Format GenCAD" + +#: pcbnew/menubarpcb.cpp:105 +msgid "&Module report" +msgstr "Rapport &Modules" + +#: pcbnew/menubarpcb.cpp:105 +msgid "Create a pcb report (footprint report)" +msgstr "Créer un fichier rapport (rapport sur modules)" + +#: pcbnew/menubarpcb.cpp:109 +msgid "E&xport" +msgstr "E&xporter" + +#: pcbnew/menubarpcb.cpp:109 +msgid "Export board" +msgstr "Exporter le C.I." + +#: pcbnew/menubarpcb.cpp:115 +msgid "Add new footprints" +msgstr "Archiver nouveaux modules" + +#: pcbnew/menubarpcb.cpp:116 +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/menubarpcb.cpp:120 +msgid "Create footprint archive" +msgstr "Créer Archive des modules" + +#: pcbnew/menubarpcb.cpp:121 +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/menubarpcb.cpp:126 +msgid "Archive footprints" +msgstr "Archiver modules" + +#: pcbnew/menubarpcb.cpp:127 +msgid "Archive or Add footprints in a library file" +msgstr "Archiver ou ajouter les modules dans un fichier librairie" + +#: pcbnew/menubarpcb.cpp:131 +#: eeschema/menubar.cpp:103 +#: cvpcb/tool_cvpcb.cpp:125 +#: kicad/buildmnu.cpp:131 +#: gerbview/tool_gerber.cpp:91 +msgid "E&xit" +msgstr "&Quitter" + +#: pcbnew/menubarpcb.cpp:131 +msgid "Quit pcbnew" +msgstr "Quitter Pcbnew" + +#: pcbnew/menubarpcb.cpp:149 +#: eeschema/menubar.cpp:121 +msgid "&Libs and Dir" +msgstr "&Libs et Rep" + +#: pcbnew/menubarpcb.cpp:150 +#: eeschema/menubar.cpp:122 +#: cvpcb/tool_cvpcb.cpp:140 +msgid "Setting Libraries, Directories and others..." +msgstr "Sélectionner les librairies et répertoires" + +#: pcbnew/menubarpcb.cpp:154 +#: eeschema/menubar.cpp:127 +#: gerbview/tool_gerber.cpp:105 +msgid "&Colors" +msgstr "&Couleurs" + +#: pcbnew/menubarpcb.cpp:155 +msgid "Select Colors and Display for PCB items" +msgstr "Selection couleurs et affichage des éléments du C.I." + +#: pcbnew/menubarpcb.cpp:159 +msgid "&General Options" +msgstr "Options &générales" + +#: pcbnew/menubarpcb.cpp:160 +msgid "Select general options for pcbnew" +msgstr " Sélection options générales pour pcbnew" + +#: pcbnew/menubarpcb.cpp:164 +msgid "&Display Options" +msgstr "Options &d'affichage" + +#: pcbnew/menubarpcb.cpp:165 +msgid "Select what items are displayed" +msgstr "Sélectionner les éléments a afficher" + +#: pcbnew/menubarpcb.cpp:175 +#: pcbnew/menubarpcb.cpp:211 +#: gerbview/tool_gerber.cpp:119 +msgid "&Save Setup" +msgstr "&Sauver Pcbnew Options" + +#: pcbnew/menubarpcb.cpp:176 +#: pcbnew/menubarpcb.cpp:212 +msgid "Save options in current directory" +msgstr "Sauver les options en répertoire de travail" + +#: pcbnew/menubarpcb.cpp:180 +#: eeschema/menubar.cpp:144 +msgid "&Read Setup" +msgstr "&Lire configuration" + +#: pcbnew/menubarpcb.cpp:181 +#: eeschema/menubar.cpp:145 +msgid "Read options from a selected config file" +msgstr "Lire options d'un fichier de configuration choisi" + +#: pcbnew/menubarpcb.cpp:190 +msgid "Tracks and Vias" +msgstr "Pistes et vias" + +#: pcbnew/menubarpcb.cpp:191 +msgid "Adjust size and width for tracks, vias" +msgstr "Ajuster dims et taille des pistes et vias" + +#: pcbnew/menubarpcb.cpp:195 +#: pcbnew/menubarmodedit.cpp:50 +#: pcbnew/set_grid.h:39 +msgid "User Grid Size" +msgstr "Dim Grille utilisteur" + +#: pcbnew/menubarpcb.cpp:196 +#: pcbnew/menubarmodedit.cpp:51 +msgid "Adjust User Grid" +msgstr "Ajuster Grille utilisateur" + +#: pcbnew/menubarpcb.cpp:200 +#: pcbnew/dialog_graphic_items_options.h:38 +msgid "Texts and Drawings" +msgstr "Textes et Tracés" + +#: pcbnew/menubarpcb.cpp:201 +#: pcbnew/menubarmodedit.cpp:41 +msgid "Adjust width for texts and drawings" +msgstr "Ajuster dims pour textes et graphiques" + +#: pcbnew/menubarpcb.cpp:206 +#: pcbnew/menubarmodedit.cpp:46 +msgid "Adjust size,shape,layers... for Pads" +msgstr "Ajuster taille, forme, couches... pour pads" + +#: pcbnew/menubarpcb.cpp:221 +msgid "Create &Modules Pos" +msgstr "Créer &Modules Pos" + +#: pcbnew/menubarpcb.cpp:222 +msgid "Gen Position modules file" +msgstr "Gen fichier Position des Modules" + +#: pcbnew/menubarpcb.cpp:226 +msgid "Create &Drill file" +msgstr "Créer &Fichier de percage" + +#: pcbnew/menubarpcb.cpp:227 +msgid "Gen Drill (EXCELLON] file and/or Drill sheet" +msgstr "Gen fichier de percage (EXCELLON] et/ou plan de percage" + +#: pcbnew/menubarpcb.cpp:231 +msgid "Create &Cmp file" +msgstr "Créer &Fichier Cmp" + +#: pcbnew/menubarpcb.cpp:232 +msgid "Recreate .cmp file for CvPcb" +msgstr "Recréer le fichier .cmp pour CvPcb" + +#: pcbnew/menubarpcb.cpp:240 +msgid "Global &Deletions" +msgstr "Effacements &Généraux" + +#: pcbnew/menubarpcb.cpp:241 +msgid "Delete Tracks, Modules, Texts... on Board" +msgstr "Effacer Pistes, Modules, Textes... sur le C.I." + +#: pcbnew/menubarpcb.cpp:245 +msgid "&List nets" +msgstr "&Liste équipots" + +#: pcbnew/menubarpcb.cpp:246 +msgid "List nets (names and id)" +msgstr "Lister équipotentielles (noms et numéros d'identification)" + +#: pcbnew/menubarpcb.cpp:250 +msgid "&Clean tracks" +msgstr "&Nettoyage pistes" + +#: pcbnew/menubarpcb.cpp:251 +msgid "Clean stubs, vias, delete break points" +msgstr "Nettoyer bouts de pistes, vias, points inutiles..." + +#: pcbnew/menubarpcb.cpp:255 +msgid "&Swap layers" +msgstr "&Permutte couches" + +#: pcbnew/menubarpcb.cpp:256 +msgid "Swap tracks on copper layers or drawings on others layers" +msgstr "Permutation de couches" + +#: pcbnew/menubarpcb.cpp:264 +#: pcbnew/menubarmodedit.cpp:60 +#: eeschema/menubar.cpp:152 +#: cvpcb/tool_cvpcb.cpp:158 +#: kicad/buildmnu.cpp:199 +#: gerbview/tool_gerber.cpp:139 +msgid "&Contents" +msgstr "&Contenu" + +#: pcbnew/menubarpcb.cpp:264 +#: pcbnew/menubarmodedit.cpp:60 +msgid "Open the pcbnew manual" +msgstr "Ouvrir la documentation de pcbnew" + +#: pcbnew/menubarpcb.cpp:268 +#: pcbnew/menubarmodedit.cpp:64 +#: eeschema/menubar.cpp:157 +#: cvpcb/tool_cvpcb.cpp:162 +#: kicad/buildmnu.cpp:204 +#: gerbview/tool_gerber.cpp:141 +msgid "&About" +msgstr "&Infos logiciel" + +#: pcbnew/menubarpcb.cpp:268 +#: pcbnew/menubarmodedit.cpp:64 +#: eeschema/menubar.cpp:157 +#: cvpcb/tool_cvpcb.cpp:163 +#: kicad/buildmnu.cpp:204 +#: gerbview/tool_gerber.cpp:142 +msgid "About this application" +msgstr "Au sujet de cette application" + +#: pcbnew/menubarpcb.cpp:276 +#: pcbnew/menubarmodedit.cpp:72 +msgid "3D Display" +msgstr "3D Visu" + +#: pcbnew/menubarpcb.cpp:276 +#: pcbnew/menubarmodedit.cpp:72 +msgid "Show Board in 3D Mode" +msgstr "Visualisation en 3D" + +#: pcbnew/menubarpcb.cpp:280 +#: eeschema/menubar.cpp:162 +#: cvpcb/tool_cvpcb.cpp:167 +#: gerbview/tool_gerber.cpp:144 +#: 3d-viewer/3d_toolbar.cpp:107 +msgid "&File" +msgstr "&Fichiers" + +#: pcbnew/menubarpcb.cpp:281 +#: eeschema/menubar.cpp:163 +#: cvpcb/tool_cvpcb.cpp:168 +#: kicad/buildmnu.cpp:211 +#: gerbview/tool_gerber.cpp:145 +#: 3d-viewer/3d_toolbar.cpp:115 +msgid "&Preferences" +msgstr "&Préférences" + +#: pcbnew/menubarpcb.cpp:282 +#: pcbnew/menubarmodedit.cpp:76 +msgid "&Dimensions" +msgstr "&Dimensions" + +#: pcbnew/menubarpcb.cpp:283 +#: gerbview/tool_gerber.cpp:146 +msgid "&Miscellaneous" +msgstr "&Divers" + +#: pcbnew/menubarpcb.cpp:284 +msgid "P&ostprocess" +msgstr "P&ostprocesseurs" + +#: pcbnew/menubarpcb.cpp:285 +#: pcbnew/menubarmodedit.cpp:77 +msgid "&3D Display" +msgstr "&3D Visu" + +#: pcbnew/menubarpcb.cpp:286 +#: pcbnew/menubarmodedit.cpp:78 +#: eeschema/menubar.cpp:164 +#: cvpcb/tool_cvpcb.cpp:169 +#: kicad/buildmnu.cpp:212 +#: gerbview/tool_gerber.cpp:148 +msgid "&Help" +msgstr "&Aide" + #: pcbnew/edit.cpp:154 msgid "Graphic not autorized on Copper layers" msgstr "Graphique non autorisé sur couches cuivre" @@ -3390,11 +4074,6 @@ msgstr "Cotation non autoris msgid "Add Tracks" msgstr "Addition de pistes" -#: pcbnew/edit.cpp:529 -#: pcbnew/tool_pcb.cpp:381 -msgid "Add Zones" -msgstr "Addition de Zones" - #: pcbnew/edit.cpp:531 msgid "Warning: Display Zone is OFF!!!" msgstr "Attention: Affichage zones désactivé !!!" @@ -3411,24 +4090,10 @@ msgstr "Ajuster Z msgid "Add Graphic" msgstr "Addition éléments graphiques" -#: pcbnew/edit.cpp:552 -#: pcbnew/tool_modedit.cpp:170 -#: pcbnew/tool_pcb.cpp:398 -#: eeschema/schedit.cpp:309 -#: eeschema/libframe.cpp:487 -#: gerbview/tool_gerber.cpp:361 -msgid "Add Text" -msgstr "Ajout de Texte" - #: pcbnew/edit.cpp:556 msgid "Add Modules" msgstr "Addition de Modules" -#: pcbnew/edit.cpp:560 -#: pcbnew/tool_pcb.cpp:403 -msgid "Add Cotation" -msgstr "Addition de Cotations" - #: pcbnew/edit.cpp:568 msgid "Net Highlight" msgstr "Surbrillance des équipotentielles" @@ -3579,12 +4244,6 @@ msgstr "Autoriser l'effacement automatique des pistes" msgid "Do not Show Zones" msgstr "Ne pas monter Zones" -#: pcbnew/pcbframe.cpp:384 -#: pcbnew/set_color.cpp:387 -#: pcbnew/tool_pcb.cpp:317 -msgid "Show Zones" -msgstr "Monter Zones" - #: pcbnew/pcbframe.cpp:389 msgid "Show Pads Sketch mode" msgstr "Afficher pastilles en contour" @@ -3605,11 +4264,6 @@ msgstr "Afficher pistes en mode plein" msgid "Normal Contrast Mode Display" msgstr "Mode d'affichage Contraste normal" -#: pcbnew/pcbframe.cpp:399 -#: pcbnew/tool_pcb.cpp:330 -msgid "Hight Contrast Mode Display" -msgstr "Mode d'affichage Haut Contraste" - #: pcbnew/pcbframe.cpp:433 msgid "Via" msgstr "Via" @@ -3679,12 +4333,6 @@ msgstr "Texte Module invisible" msgid "Anchors" msgstr "Ancres" -#: pcbnew/set_color.cpp:378 -#: pcbnew/tool_pcb.cpp:529 -#: gerbview/set_color.h:246 -msgid "Grid" -msgstr "Grille" - #: pcbnew/set_color.cpp:396 msgid "Show Noconnect" msgstr "Montrer Non Conn" @@ -3761,88 +4409,6 @@ msgstr "Infos:" msgid "Sizes and Widths" msgstr "Dims. et Epaiss." -#: pcbnew/menubarmodedit.cpp:41 -#: pcbnew/menubarpcb.cpp:201 -msgid "Adjust width for texts and drawings" -msgstr "Ajuster dims pour textes et graphiques" - -#: pcbnew/menubarmodedit.cpp:46 -#: pcbnew/menubarpcb.cpp:206 -msgid "Adjust size,shape,layers... for Pads" -msgstr "Ajuster taille, forme, couches... pour pads" - -#: pcbnew/menubarmodedit.cpp:50 -#: pcbnew/menubarpcb.cpp:195 -#: pcbnew/set_grid.h:39 -msgid "User Grid Size" -msgstr "Dim Grille utilisteur" - -#: pcbnew/menubarmodedit.cpp:51 -#: pcbnew/menubarpcb.cpp:196 -msgid "Adjust User Grid" -msgstr "Ajuster Grille utilisateur" - -#: pcbnew/menubarmodedit.cpp:60 -#: pcbnew/menubarpcb.cpp:264 -#: eeschema/menubar.cpp:152 -#: cvpcb/tool_cvpcb.cpp:158 -#: kicad/buildmnu.cpp:199 -#: gerbview/tool_gerber.cpp:139 -msgid "&Contents" -msgstr "&Contenu" - -#: pcbnew/menubarmodedit.cpp:60 -#: pcbnew/menubarpcb.cpp:264 -msgid "Open the pcbnew manual" -msgstr "Ouvrir la documentation de pcbnew" - -#: pcbnew/menubarmodedit.cpp:64 -#: pcbnew/menubarpcb.cpp:268 -#: eeschema/menubar.cpp:157 -#: cvpcb/tool_cvpcb.cpp:162 -#: kicad/buildmnu.cpp:204 -#: gerbview/tool_gerber.cpp:141 -msgid "&About" -msgstr "&Infos logiciel" - -#: pcbnew/menubarmodedit.cpp:64 -#: pcbnew/menubarpcb.cpp:268 -#: eeschema/menubar.cpp:157 -#: cvpcb/tool_cvpcb.cpp:163 -#: kicad/buildmnu.cpp:204 -#: gerbview/tool_gerber.cpp:142 -msgid "About this application" -msgstr "Au sujet de cette application" - -#: pcbnew/menubarmodedit.cpp:72 -#: pcbnew/menubarpcb.cpp:276 -msgid "3D Display" -msgstr "3D Visu" - -#: pcbnew/menubarmodedit.cpp:72 -#: pcbnew/menubarpcb.cpp:276 -msgid "Show Board in 3D Mode" -msgstr "Visualisation en 3D" - -#: pcbnew/menubarmodedit.cpp:76 -#: pcbnew/menubarpcb.cpp:282 -msgid "&Dimensions" -msgstr "&Dimensions" - -#: pcbnew/menubarmodedit.cpp:77 -#: pcbnew/menubarpcb.cpp:285 -msgid "&3D Display" -msgstr "&3D Visu" - -#: pcbnew/menubarmodedit.cpp:78 -#: pcbnew/menubarpcb.cpp:286 -#: eeschema/menubar.cpp:164 -#: cvpcb/tool_cvpcb.cpp:169 -#: kicad/buildmnu.cpp:212 -#: gerbview/tool_gerber.cpp:148 -msgid "&Help" -msgstr "&Aide" - #: pcbnew/move_or_drag_track.cpp:640 msgid "Unable to drag this segment: too many segments connected" msgstr "Impossible de drag ce segment: trop de segments connectés" @@ -4049,48 +4615,6 @@ msgstr "Propri msgid "Print Module" msgstr "Imprimer Module" -#: pcbnew/tool_modedit.cpp:111 -#: pcbnew/tool_pcb.cpp:246 -#: eeschema/tool_sch.cpp:104 -#: eeschema/tool_lib.cpp:170 -#: eeschema/tool_viewlib.cpp:70 -#: cvpcb/displayframe.cpp:118 -#: gerbview/tool_gerber.cpp:260 -#: 3d-viewer/3d_toolbar.cpp:43 -msgid "zoom + (F1)" -msgstr "zoom + (F1)" - -#: pcbnew/tool_modedit.cpp:114 -#: pcbnew/tool_pcb.cpp:247 -#: eeschema/tool_sch.cpp:107 -#: eeschema/tool_lib.cpp:174 -#: eeschema/tool_viewlib.cpp:74 -#: cvpcb/displayframe.cpp:121 -#: gerbview/tool_gerber.cpp:266 -#: 3d-viewer/3d_toolbar.cpp:46 -msgid "zoom - (F2)" -msgstr "zoom - (F2)" - -#: pcbnew/tool_modedit.cpp:117 -#: pcbnew/tool_pcb.cpp:248 -#: eeschema/tool_sch.cpp:110 -#: eeschema/tool_lib.cpp:178 -#: eeschema/tool_viewlib.cpp:78 -#: cvpcb/displayframe.cpp:124 -#: gerbview/tool_gerber.cpp:272 -#: 3d-viewer/3d_toolbar.cpp:49 -msgid "redraw (F3)" -msgstr "Redessin (F3)" - -#: pcbnew/tool_modedit.cpp:120 -#: pcbnew/tool_pcb.cpp:250 -#: eeschema/tool_sch.cpp:113 -#: eeschema/tool_lib.cpp:182 -#: gerbview/tool_gerber.cpp:278 -#: 3d-viewer/3d_toolbar.cpp:52 -msgid "auto zoom" -msgstr "Zoom automatique" - #: pcbnew/tool_modedit.cpp:129 msgid "Module Check" msgstr "Test module" @@ -4099,74 +4623,11 @@ msgstr "Test module" msgid "Add Pads" msgstr "Addition de \"pins\"" -#: pcbnew/tool_modedit.cpp:158 -#: pcbnew/tool_pcb.cpp:386 -#: eeschema/tool_sch.cpp:216 -msgid "Add graphic line or polygon" -msgstr "Addition de lignes ou polygones graphiques" - -#: pcbnew/tool_modedit.cpp:162 -#: pcbnew/tool_pcb.cpp:390 -msgid "Add graphic circle" -msgstr "Addition de graphiques (Cercle)" - -#: pcbnew/tool_modedit.cpp:166 -#: pcbnew/tool_pcb.cpp:394 -msgid "Add graphic arc" -msgstr "Addition de graphiques (Arc de Cercle)" - #: pcbnew/tool_modedit.cpp:175 #: pcbnew/modedit.cpp:379 msgid "Place anchor" msgstr "Place Ancre" -#: pcbnew/tool_modedit.cpp:180 -#: pcbnew/tool_pcb.cpp:412 -#: eeschema/tool_sch.cpp:225 -#: eeschema/tool_lib.cpp:92 -#: gerbview/tool_gerber.cpp:369 -msgid "Delete items" -msgstr "Suppression d'éléments" - -#: pcbnew/tool_modedit.cpp:201 -#: pcbnew/tool_pcb.cpp:293 -#: eeschema/tool_sch.cpp:246 -#: gerbview/tool_gerber.cpp:389 -msgid "Display Grid OFF" -msgstr "Suppression de l'affichage de la grille" - -#: pcbnew/tool_modedit.cpp:205 -#: pcbnew/tool_pcb.cpp:295 -#: gerbview/tool_gerber.cpp:395 -msgid "Display Polar Coord ON" -msgstr "Activer affichage coord Polaires" - -#: pcbnew/tool_modedit.cpp:209 -#: pcbnew/tool_pcb.cpp:297 -#: eeschema/tool_sch.cpp:250 -#: gerbview/tool_gerber.cpp:399 -msgid "Units = Inch" -msgstr "Unités = pouce" - -#: pcbnew/tool_modedit.cpp:213 -#: pcbnew/tool_pcb.cpp:299 -#: eeschema/tool_sch.cpp:254 -#: gerbview/tool_gerber.cpp:403 -msgid "Units = mm" -msgstr "Unités = mm" - -#: pcbnew/tool_modedit.cpp:219 -#: pcbnew/tool_pcb.cpp:301 -#: eeschema/tool_sch.cpp:258 -#: gerbview/tool_gerber.cpp:409 -msgid "Change Cursor Shape" -msgstr "Sélection de la forme du curseur" - -#: pcbnew/tool_modedit.cpp:227 -#: pcbnew/tool_pcb.cpp:322 -msgid "Show Pads Sketch" -msgstr "Afficher pastilles en contour" - #: pcbnew/tool_modedit.cpp:234 msgid "Show Texts Sketch" msgstr "Afficher textes en contour" @@ -4175,13 +4636,6 @@ msgstr "Afficher textes en contour" msgid "Show Edges Sketch" msgstr "Afficher Modules en contour" -#: pcbnew/tool_modedit.cpp:273 -#: pcbnew/tool_pcb.cpp:512 -#: eeschema/plotps.cpp:168 -#: share/zoom.cpp:353 -msgid "Auto" -msgstr "Auto" - #: pcbnew/tool_modedit.cpp:277 #, c-format msgid "Zoom %d" @@ -4197,11 +4651,6 @@ msgstr "Grille %.1f" msgid "Grid %.3f" msgstr "Grille %.3f" -#: pcbnew/tool_modedit.cpp:299 -#: pcbnew/tool_pcb.cpp:542 -msgid "User Grid" -msgstr "Grille perso" - #: pcbnew/modedit.cpp:362 msgid "Add Pad" msgstr "Ajouter Pastilles" @@ -4231,296 +4680,6 @@ msgstr "Pin %s (module %s) non trouv msgid "Locate Pin %s (module %s)" msgstr "Pin localisée %s (module %s)" -#: pcbnew/menubarpcb.cpp:41 -msgid "Load Board Ctrl-O" -msgstr "Charger Circuit Imprimé (Ctrl O)" - -#: pcbnew/menubarpcb.cpp:42 -msgid "Delete old Board and Load new Board" -msgstr "Effacer ancien C.I. et charger un nouveau" - -#: pcbnew/menubarpcb.cpp:47 -msgid "Append Board" -msgstr "Ajouter Circuit Imprimé" - -#: pcbnew/menubarpcb.cpp:48 -msgid "Add Board to old Board" -msgstr "Ajouter un C.I. au C.I. actuel" - -#: pcbnew/menubarpcb.cpp:53 -msgid "&New board" -msgstr "&Nouveau Circuit Imprimé" - -#: pcbnew/menubarpcb.cpp:54 -msgid "Clear old PCB and init a new one" -msgstr "Effacer C.I. ancien et créer un nouveau" - -#: pcbnew/menubarpcb.cpp:59 -msgid "&Rescue" -msgstr "&Secours" - -#: pcbnew/menubarpcb.cpp:60 -msgid "Clear old board and get last rescue file" -msgstr "Effacer C.I. actuel et reprendre dernier fichier secours" - -#: pcbnew/menubarpcb.cpp:65 -msgid "&Previous version" -msgstr "&Précédente version" - -#: pcbnew/menubarpcb.cpp:66 -msgid "Clear old board and get old version of board" -msgstr "Effacer C.I. actuel et reprendre ancienne version" - -#: pcbnew/menubarpcb.cpp:73 -msgid "&Save board Ctrl-S" -msgstr "Sauver Circuit Imprimé (Ctrl S)" - -#: pcbnew/menubarpcb.cpp:74 -msgid "Save current board" -msgstr "Sauver le C.I. actuel" - -#: pcbnew/menubarpcb.cpp:79 -msgid "Save Board as.." -msgstr "Sauver C.I. sous.." - -#: pcbnew/menubarpcb.cpp:80 -msgid "Save current board as.." -msgstr "Sauver le Circuit Imprimé courant sous.." - -#: pcbnew/menubarpcb.cpp:87 -#: eeschema/menubar.cpp:70 -#: gerbview/tool_gerber.cpp:86 -msgid "P&rint" -msgstr "Imp&rimer" - -#: pcbnew/menubarpcb.cpp:87 -#: eeschema/menubar.cpp:70 -#: gerbview/tool_gerber.cpp:86 -msgid "Print on current printer" -msgstr "Imprimer sur l'imprimante par défaut" - -#: pcbnew/menubarpcb.cpp:92 -#: eeschema/menubar.cpp:100 -msgid "&Plot" -msgstr "&Tracer" - -#: pcbnew/menubarpcb.cpp:93 -#: pcbnew/tool_pcb.cpp:243 -msgid "Plot (Hplg, Postscript, or Gerber format)" -msgstr "Tracer en format HPGL, POSTSCRIPT ou GERBER" - -#: pcbnew/menubarpcb.cpp:101 -msgid "&GenCAD" -msgstr "&GenCAD" - -#: pcbnew/menubarpcb.cpp:101 -msgid "Export GenCAD Format" -msgstr "Exporter en Format GenCAD" - -#: pcbnew/menubarpcb.cpp:105 -msgid "&Module report" -msgstr "Rapport &Modules" - -#: pcbnew/menubarpcb.cpp:105 -msgid "Create a pcb report (footprint report)" -msgstr "Créer un fichier rapport (rapport sur modules)" - -#: pcbnew/menubarpcb.cpp:109 -msgid "E&xport" -msgstr "E&xporter" - -#: pcbnew/menubarpcb.cpp:109 -msgid "Export board" -msgstr "Exporter le C.I." - -#: pcbnew/menubarpcb.cpp:115 -msgid "Add new footprints" -msgstr "Archiver nouveaux modules" - -#: pcbnew/menubarpcb.cpp:116 -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/menubarpcb.cpp:120 -msgid "Create footprint archive" -msgstr "Créer Archive des modules" - -#: pcbnew/menubarpcb.cpp:121 -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/menubarpcb.cpp:126 -msgid "Archive footprints" -msgstr "Archiver modules" - -#: pcbnew/menubarpcb.cpp:127 -msgid "Archive or Add footprints in a library file" -msgstr "Archiver ou ajouter les modules dans un fichier librairie" - -#: pcbnew/menubarpcb.cpp:131 -#: eeschema/menubar.cpp:103 -#: cvpcb/tool_cvpcb.cpp:125 -#: kicad/buildmnu.cpp:131 -#: gerbview/tool_gerber.cpp:91 -msgid "E&xit" -msgstr "&Quitter" - -#: pcbnew/menubarpcb.cpp:131 -msgid "Quit pcbnew" -msgstr "Quitter Pcbnew" - -#: pcbnew/menubarpcb.cpp:149 -#: eeschema/menubar.cpp:121 -msgid "&Libs and Dir" -msgstr "&Libs et Rep" - -#: pcbnew/menubarpcb.cpp:150 -#: eeschema/menubar.cpp:122 -#: cvpcb/tool_cvpcb.cpp:140 -msgid "Setting Libraries, Directories and others..." -msgstr "Sélectionner les librairies et répertoires" - -#: pcbnew/menubarpcb.cpp:154 -#: eeschema/menubar.cpp:127 -#: gerbview/tool_gerber.cpp:105 -msgid "&Colors" -msgstr "&Couleurs" - -#: pcbnew/menubarpcb.cpp:155 -msgid "Select Colors and Display for PCB items" -msgstr "Selection couleurs et affichage des éléments du C.I." - -#: pcbnew/menubarpcb.cpp:159 -msgid "&General Options" -msgstr "Options &générales" - -#: pcbnew/menubarpcb.cpp:160 -msgid "Select general options for pcbnew" -msgstr " Sélection options générales pour pcbnew" - -#: pcbnew/menubarpcb.cpp:164 -msgid "&Display Options" -msgstr "Options &d'affichage" - -#: pcbnew/menubarpcb.cpp:165 -msgid "Select what items are displayed" -msgstr "Sélectionner les éléments a afficher" - -#: pcbnew/menubarpcb.cpp:175 -#: pcbnew/menubarpcb.cpp:211 -msgid "&Save Setup" -msgstr "&Sauver Pcbnew Options" - -#: pcbnew/menubarpcb.cpp:176 -#: pcbnew/menubarpcb.cpp:212 -msgid "Save options in current directory" -msgstr "Sauver les options en répertoire de travail" - -#: pcbnew/menubarpcb.cpp:180 -#: eeschema/menubar.cpp:144 -msgid "&Read Setup" -msgstr "&Lire configuration" - -#: pcbnew/menubarpcb.cpp:181 -#: eeschema/menubar.cpp:145 -msgid "Read options from a selected config file" -msgstr "Lire options d'un fichier de configuration choisi" - -#: pcbnew/menubarpcb.cpp:190 -msgid "Tracks and Vias" -msgstr "Pistes et vias" - -#: pcbnew/menubarpcb.cpp:191 -msgid "Adjust size and width for tracks, vias" -msgstr "Ajuster dims et taille des pistes et vias" - -#: pcbnew/menubarpcb.cpp:200 -#: pcbnew/dialog_graphic_items_options.h:38 -msgid "Texts and Drawings" -msgstr "Textes et Tracés" - -#: pcbnew/menubarpcb.cpp:221 -msgid "Create &Modules Pos" -msgstr "Créer &Modules Pos" - -#: pcbnew/menubarpcb.cpp:222 -msgid "Gen Position modules file" -msgstr "Gen fichier Position des Modules" - -#: pcbnew/menubarpcb.cpp:226 -msgid "Create &Drill file" -msgstr "Créer &Fichier de percage" - -#: pcbnew/menubarpcb.cpp:227 -msgid "Gen Drill (EXCELLON] file and/or Drill sheet" -msgstr "Gen fichier de percage (EXCELLON] et/ou plan de percage" - -#: pcbnew/menubarpcb.cpp:231 -msgid "Create &Cmp file" -msgstr "Créer &Fichier Cmp" - -#: pcbnew/menubarpcb.cpp:232 -msgid "Recreate .cmp file for CvPcb" -msgstr "Recréer le fichier .cmp pour CvPcb" - -#: pcbnew/menubarpcb.cpp:240 -msgid "Global &Deletions" -msgstr "Effacements &Généraux" - -#: pcbnew/menubarpcb.cpp:241 -msgid "Delete Tracks, Modules, Texts... on Board" -msgstr "Effacer Pistes, Modules, Textes... sur le C.I." - -#: pcbnew/menubarpcb.cpp:245 -msgid "&List nets" -msgstr "&Liste équipots" - -#: pcbnew/menubarpcb.cpp:246 -msgid "List nets (names and id)" -msgstr "Lister équipotentielles (noms et numéros d'identification)" - -#: pcbnew/menubarpcb.cpp:250 -msgid "&Clean tracks" -msgstr "&Nettoyage pistes" - -#: pcbnew/menubarpcb.cpp:251 -msgid "Clean stubs, vias, delete break points" -msgstr "Nettoyer bouts de pistes, vias, points inutiles..." - -#: pcbnew/menubarpcb.cpp:255 -msgid "&Swap layers" -msgstr "&Permutte couches" - -#: pcbnew/menubarpcb.cpp:256 -msgid "Swap tracks on copper layers or drawings on others layers" -msgstr "Permutation de couches" - -#: pcbnew/menubarpcb.cpp:280 -#: eeschema/menubar.cpp:162 -#: cvpcb/tool_cvpcb.cpp:167 -#: gerbview/tool_gerber.cpp:144 -#: 3d-viewer/3d_toolbar.cpp:107 -msgid "&File" -msgstr "&Fichiers" - -#: pcbnew/menubarpcb.cpp:281 -#: eeschema/menubar.cpp:163 -#: cvpcb/tool_cvpcb.cpp:168 -#: kicad/buildmnu.cpp:211 -#: gerbview/tool_gerber.cpp:145 -#: 3d-viewer/3d_toolbar.cpp:115 -msgid "&Preferences" -msgstr "&Préférences" - -#: pcbnew/menubarpcb.cpp:283 -#: gerbview/tool_gerber.cpp:146 -msgid "&Miscellaneous" -msgstr "&Divers" - -#: pcbnew/menubarpcb.cpp:284 -msgid "P&ostprocess" -msgstr "P&ostprocesseurs" - #: pcbnew/moduleframe.cpp:176 msgid "Module Editor: module modified!, Continue ?" msgstr "Editeur de Module: module modifié! Continuer ?" @@ -4533,164 +4692,6 @@ msgstr "Module trouv msgid "Delete module?" msgstr "Effacer Module?" -#: pcbnew/tool_pcb.cpp:49 -msgid "" -"Show active layer selections\n" -"and select layer pair for route and place via" -msgstr "" -"Affiche selections couche active\n" -"et selection paire de couches pour routage and placement via" - -#: pcbnew/tool_pcb.cpp:219 -msgid "New Board" -msgstr "Nouveau Circuit Imprimé" - -#: pcbnew/tool_pcb.cpp:220 -msgid "Open existing Board" -msgstr "Ouvrir C.I. existant" - -#: pcbnew/tool_pcb.cpp:221 -msgid "Save Board" -msgstr "Sauver Circuit Imprimé" - -#: pcbnew/tool_pcb.cpp:224 -#: eeschema/tool_sch.cpp:61 -#: gerbview/tool_gerber.cpp:217 -msgid "page settings (size, texts)" -msgstr "Ajustage de la feuille de dessin (dimensions, textes)" - -#: pcbnew/tool_pcb.cpp:228 -msgid "Open Module Editor" -msgstr "Ouvrir Editeur de modules" - -#: pcbnew/tool_pcb.cpp:231 -#: eeschema/tool_sch.cpp:77 -#: gerbview/tool_gerber.cpp:228 -msgid "Cut selected item" -msgstr "Suppression des éléments sélectionnés" - -#: pcbnew/tool_pcb.cpp:234 -#: eeschema/tool_sch.cpp:80 -#: gerbview/tool_gerber.cpp:233 -msgid "Copy selected item" -msgstr "Copie des éléments sélectionnés" - -#: pcbnew/tool_pcb.cpp:236 -#: eeschema/tool_sch.cpp:83 -#: gerbview/tool_gerber.cpp:239 -msgid "Paste" -msgstr "Copie des éléments sauvegardés" - -#: pcbnew/tool_pcb.cpp:239 -#: gerbview/tool_gerber.cpp:246 -msgid "Undelete" -msgstr "Annulation du dernier effacement" - -#: pcbnew/tool_pcb.cpp:242 -msgid "Print Board" -msgstr "Imprimer C.I." - -#: pcbnew/tool_pcb.cpp:253 -msgid "Find components and texts (Ctrl-F)" -msgstr "Recherche de composants et textes (Ctrl F)" - -#: pcbnew/tool_pcb.cpp:256 -msgid "Read Netlist" -msgstr "Lire Netliste" - -#: pcbnew/tool_pcb.cpp:257 -msgid "Pcb Design Rules Check" -msgstr "Controle des règles de conception" - -#: pcbnew/tool_pcb.cpp:267 -msgid "Mode Module: Manual and Automatic Move or Place for modules" -msgstr "Mode Module: Déplacements ou Placement Manuel ou Automatique des modules" - -#: pcbnew/tool_pcb.cpp:269 -msgid "Mode Track and Autorouting" -msgstr "Mode Pistes and Autoroutage" - -#: pcbnew/tool_pcb.cpp:291 -msgid "Drc OFF" -msgstr "Drc DESACTIVEE" - -#: pcbnew/tool_pcb.cpp:306 -msgid "Show General Ratsnest" -msgstr "Monter le chevelu général" - -#: pcbnew/tool_pcb.cpp:309 -msgid "Show Module Ratsnest when moving" -msgstr "Monter le chevelu du module pendant déplacement" - -#: pcbnew/tool_pcb.cpp:313 -msgid "Enable Auto Del Track" -msgstr "Autoriser l'effacement automatique des pistes" - -#: pcbnew/tool_pcb.cpp:326 -msgid "Show Tracks Sketch" -msgstr "Afficher pistes en contour" - -#: pcbnew/tool_pcb.cpp:338 -msgid "" -"Display auxiliary vertical toolbar (tools for micro wave applications)\n" -" This is a very experimental feature (under development)" -msgstr "" -"Affiche toolbar vertical auxiliaire (outils pour applications micro-ondes)\n" -"C'est un outil expérimental (en cours de développement)" - -#: pcbnew/tool_pcb.cpp:364 -msgid "Net highlight" -msgstr "Surbrillance des équipotentielles" - -#: pcbnew/tool_pcb.cpp:368 -msgid "Display local ratsnest (pad or module)" -msgstr "Afficher le chevelu local (pastilles ou modules)" - -#: pcbnew/tool_pcb.cpp:373 -msgid "Add modules" -msgstr "Addition de Modules" - -#: pcbnew/tool_pcb.cpp:377 -msgid "Add Tracks an vias" -msgstr "Ajouter pistes et vias" - -#: pcbnew/tool_pcb.cpp:407 -#: gerbview/tool_gerber.cpp:354 -msgid "Add Mires" -msgstr "Addition de Mires de superposition" - -#: pcbnew/tool_pcb.cpp:417 -msgid "Offset adjust for drill and place files" -msgstr "Ajuste offset pour fichier de perçage et placement" - -#: pcbnew/tool_pcb.cpp:440 -msgid "Create line of specified length for microwave applications" -msgstr "Creation de lignes de longueur spécifiée (pour applications micro-ondes)" - -#: pcbnew/tool_pcb.cpp:446 -msgid "Create gap of specified length for microwave applications" -msgstr "Creation de gaps de longueur spécifiée (pour applications micro-ondes)" - -#: pcbnew/tool_pcb.cpp:454 -msgid "Create stub of specified length for microwave applications" -msgstr "Creation de stub de longueur spécifiée (pour applications micro-ondes)" - -#: pcbnew/tool_pcb.cpp:460 -msgid "Create stub (arc) of specified length for microwave applications" -msgstr "Creation de stub (arc) de longueur spécifiée (pour applications micro-ondes)" - -#: pcbnew/tool_pcb.cpp:466 -msgid "Create a polynomial shape for microwave applications" -msgstr "Creation de formes polynomiales (pour applications micro-ondes)" - -#: pcbnew/tool_pcb.cpp:516 -msgid "Zoom " -msgstr "Zoom " - -#: pcbnew/tool_pcb.cpp:591 -msgid "+/- to switch" -msgstr "+/- pour commuter" - #: eeschema/save_schemas.cpp:71 #: eeschema/files-io.cpp:62 #: eeschema/eeload.cpp:56 @@ -4723,7 +4724,7 @@ msgstr "Propri #: eeschema/libedpart.cpp:241 #: eeschema/dialog_edit_component_in_schematic.cpp:204 #: eeschema/editpart.cpp:204 -#: eeschema/dialog_build_BOM.cpp:327 +#: eeschema/dialog_build_BOM.cpp:279 #: cvpcb/options.cpp:138 #: cvpcb/dialog_display_options.h:43 msgid "Options" @@ -5735,7 +5736,7 @@ msgid "&Del Markers" msgstr "&Supprimer Marqueurs" #: eeschema/dialog_erc.cpp:218 -#: eeschema/dialog_build_BOM.cpp:323 +#: eeschema/dialog_build_BOM.cpp:336 msgid "&Quit" msgstr "&Quitter" @@ -6001,7 +6002,7 @@ msgid "Hierachy Pins by Sheets" msgstr "Pins de hiérarchie par feuilles" #: eeschema/genliste.cpp:144 -#: eeschema/dialog_build_BOM.cpp:318 +#: eeschema/dialog_build_BOM.cpp:331 msgid "&Create List" msgstr "&Créer Liste" @@ -6015,8 +6016,8 @@ msgid "List of material:" msgstr "Liste du Matériel:" #: eeschema/genliste.cpp:214 -#: eeschema/dialog_build_BOM.cpp:476 -#: eeschema/dialog_build_BOM.cpp:528 +#: eeschema/dialog_build_BOM.cpp:481 +#: eeschema/dialog_build_BOM.cpp:533 msgid "Failed to open file " msgstr "Erreur ouverture " @@ -6037,7 +6038,7 @@ msgstr "" "#Glob labels ( ordre = Alphab. )\n" #: eeschema/genliste.cpp:294 -#: eeschema/dialog_build_BOM.cpp:609 +#: eeschema/dialog_build_BOM.cpp:614 msgid "" "\n" "#End List\n" @@ -6046,7 +6047,7 @@ msgstr "" "#End List\n" #: eeschema/genliste.cpp:584 -#: eeschema/dialog_build_BOM.cpp:969 +#: eeschema/dialog_build_BOM.cpp:974 msgid "" "\n" "#Cmp ( order = Reference )" @@ -6056,27 +6057,27 @@ msgstr "" #: eeschema/genliste.cpp:585 #: eeschema/genliste.cpp:640 -#: eeschema/dialog_build_BOM.cpp:970 -#: eeschema/dialog_build_BOM.cpp:1036 +#: eeschema/dialog_build_BOM.cpp:975 +#: eeschema/dialog_build_BOM.cpp:1041 msgid " (with SubCmp)" msgstr "avec sub-composants" #: eeschema/genliste.cpp:616 #: eeschema/hierarch.cpp:134 #: eeschema/erc.cpp:690 -#: eeschema/dialog_build_BOM.cpp:1004 +#: eeschema/dialog_build_BOM.cpp:1009 msgid "Root" msgstr "Racine" #: eeschema/genliste.cpp:623 #: eeschema/genliste.cpp:672 -#: eeschema/dialog_build_BOM.cpp:1018 -#: eeschema/dialog_build_BOM.cpp:1070 +#: eeschema/dialog_build_BOM.cpp:1023 +#: eeschema/dialog_build_BOM.cpp:1075 msgid "#End Cmp\n" msgstr "#End Cmp\n" #: eeschema/genliste.cpp:639 -#: eeschema/dialog_build_BOM.cpp:1035 +#: eeschema/dialog_build_BOM.cpp:1040 msgid "" "\n" "#Cmp ( order = Value )" @@ -6085,19 +6086,19 @@ msgstr "" "#Cmp ( ordre = Valeur )" #: eeschema/genliste.cpp:697 -#: eeschema/dialog_build_BOM.cpp:1095 +#: eeschema/dialog_build_BOM.cpp:1100 #, c-format msgid "> %-28.28s Global (Sheet %.2d) pos: %3.3f, %3.3f\n" msgstr "> %-28.28s Global (feuille %.2d) pos: %3.3f, %3.3f\n" #: eeschema/genliste.cpp:713 -#: eeschema/dialog_build_BOM.cpp:1111 +#: eeschema/dialog_build_BOM.cpp:1116 #, c-format msgid "> %-28.28s Sheet %-7.7s (Sheet %.2d) pos: %3.3f, %3.3f\n" msgstr "> %-28.28s Sheet %-7.7s (feuille %.2d) pos: %3.3f, %3.3f\n" #: eeschema/genliste.cpp:726 -#: eeschema/dialog_build_BOM.cpp:1124 +#: eeschema/dialog_build_BOM.cpp:1129 msgid "#End labels\n" msgstr "#End labels\n" @@ -6510,7 +6511,7 @@ msgid "Sheet" msgstr "Feuille" #: eeschema/component_class.cpp:53 -#: eeschema/dialog_build_BOM.cpp:962 +#: eeschema/dialog_build_BOM.cpp:967 msgid "Field" msgstr "Champ" @@ -7631,151 +7632,6 @@ msgstr "Type msgid "Empty Text!" msgstr "Texte vide" -#: eeschema/menubar.cpp:37 -msgid "&Load Schematic Project" -msgstr "&Charger Projet schématique" - -#: eeschema/menubar.cpp:38 -msgid "Load a schematic project (Schematic, libraries...)" -msgstr "Charger un projet schématique complet (schemas, librairies...)" - -#: eeschema/menubar.cpp:43 -msgid "&Reload the current sheet" -msgstr "&Recharger la feuille courante" - -#: eeschema/menubar.cpp:44 -msgid "Load or reload a schematic file from file into the current sheet" -msgstr "Charger ou recharger un schema a partir d'un fichier dans la feuille courante" - -#: eeschema/menubar.cpp:50 -msgid "&Save Schematic Project" -msgstr "&Sauver le Projet schématique" - -#: eeschema/menubar.cpp:51 -msgid "Save all" -msgstr "Tout sauver" - -#: eeschema/menubar.cpp:57 -msgid "Save &Current sheet" -msgstr "Sauver &Feuille active" - -#: eeschema/menubar.cpp:58 -msgid "Save current sheet only" -msgstr "Sauver la feuille active uniquement" - -#: eeschema/menubar.cpp:63 -msgid "Save Current sheet &as.." -msgstr "Sauver la feuille &active sous.." - -#: eeschema/menubar.cpp:64 -msgid "Save current sheet as.." -msgstr "Sauver la feuille active sous un autre nom" - -#: eeschema/menubar.cpp:76 -msgid "Plot Postscript" -msgstr "Tracé Postscript" - -#: eeschema/menubar.cpp:76 -msgid "Plotting in Postscript format" -msgstr "Générer un tracé en format Postscript" - -#: eeschema/menubar.cpp:81 -msgid "Plot HPGL" -msgstr "Tracé HPGL" - -#: eeschema/menubar.cpp:81 -msgid "Plotting in HPGL format" -msgstr "Générer un tracé en format HPGL" - -#: eeschema/menubar.cpp:86 -msgid "Plot SVG" -msgstr "Tracé SVG" - -#: eeschema/menubar.cpp:86 -msgid "Plotting in SVG format" -msgstr "Générer un tracé en format SVG" - -#: eeschema/menubar.cpp:93 -msgid "Plot to Clipboard" -msgstr "Tracé dans Presse papier" - -#: eeschema/menubar.cpp:93 -msgid "Export drawings to clipboard" -msgstr " Export du dessin dans le presse-papier" - -#: eeschema/menubar.cpp:100 -msgid "Plot Hplg, Postscript, SVG" -msgstr "Tracer en format HPGL, POSTSCRIPT ou SVG" - -#: eeschema/menubar.cpp:103 -msgid "Quit Eeschema" -msgstr "Quitter Eeschema" - -#: eeschema/menubar.cpp:128 -msgid "Setting colors ..." -msgstr "Choisir les couleurs d'affichage" - -#: eeschema/menubar.cpp:132 -#: gerbview/tool_gerber.cpp:107 -msgid "&Options" -msgstr "&Options" - -#: eeschema/menubar.cpp:140 -msgid "&Save Eeschema Setup" -msgstr "&Sauver Eeschema Options" - -#: eeschema/menubar.cpp:141 -msgid "Save options in .pro" -msgstr "Sauver les options en .pro" - -#: eeschema/menubar.cpp:152 -msgid "Open the eeschema manual" -msgstr "Ouvrir la documentation de eeschema" - -#: eeschema/annotate_dialog.cpp:119 -msgid "Hierarchy" -msgstr "Hiérarchie" - -#: eeschema/annotate_dialog.cpp:120 -msgid "Current sheet" -msgstr "Feuille active" - -#: eeschema/annotate_dialog.cpp:122 -msgid "annotate:" -msgstr "Numérotation:" - -#: eeschema/annotate_dialog.cpp:126 -msgid "all components" -msgstr "Tous les composants" - -#: eeschema/annotate_dialog.cpp:127 -msgid "new components only" -msgstr "Nouveaux composants seulement" - -#: eeschema/annotate_dialog.cpp:129 -msgid "select items:" -msgstr "Sélection:" - -#: eeschema/annotate_dialog.cpp:133 -msgid "by position" -msgstr "par position" - -#: eeschema/annotate_dialog.cpp:134 -msgid "by value" -msgstr "par valeur" - -#: eeschema/annotate_dialog.cpp:136 -msgid "sorting:" -msgstr "Tri:" - -#: eeschema/annotate_dialog.cpp:142 -msgid "&Annotate" -msgstr "Numérot&ation" - -#: eeschema/annotate_dialog.cpp:147 -msgid "&Del Annotate" -msgstr "&Dénumérotation" - #: eeschema/erc.cpp:284 msgid "Annotation Required!" msgstr "Numérotation requise!" @@ -7878,51 +7734,51 @@ msgstr "," msgid "Field separator for spreadsheet import:" msgstr "Separateur de champ pour import dans tableu:" -#: eeschema/dialog_build_BOM.cpp:279 -msgid "Fields to Add" -msgstr "Champ à ajouterr" - #: eeschema/dialog_build_BOM.cpp:283 -msgid "Add Field 1" -msgstr "Ajouter Champ 1" - -#: eeschema/dialog_build_BOM.cpp:287 -msgid "Add Field 2" -msgstr "Ajouter Champ 2" - -#: eeschema/dialog_build_BOM.cpp:291 -msgid "Add Field 3" -msgstr "Ajouter Champ 3" - -#: eeschema/dialog_build_BOM.cpp:295 -msgid "Add Field 4" -msgstr "Ajouter Champ 4" - -#: eeschema/dialog_build_BOM.cpp:299 -msgid "Add Field 5" -msgstr "Ajouter Champ 5" - -#: eeschema/dialog_build_BOM.cpp:303 -msgid "Add Field 6" -msgstr "Ajouter Champ 6" - -#: eeschema/dialog_build_BOM.cpp:307 -msgid "Add Field 7" -msgstr "Ajouter Champ 7" - -#: eeschema/dialog_build_BOM.cpp:311 -msgid "Add Field 8" -msgstr "Ajouter Champ 8" - -#: eeschema/dialog_build_BOM.cpp:331 msgid "Launch list browser" msgstr "Lancer le visualisateur de liste" -#: eeschema/dialog_build_BOM.cpp:432 +#: eeschema/dialog_build_BOM.cpp:290 +msgid "Fields to Add" +msgstr "Champ à ajouterr" + +#: eeschema/dialog_build_BOM.cpp:294 +msgid "Add Field 1" +msgstr "Ajouter Champ 1" + +#: eeschema/dialog_build_BOM.cpp:298 +msgid "Add Field 2" +msgstr "Ajouter Champ 2" + +#: eeschema/dialog_build_BOM.cpp:302 +msgid "Add Field 3" +msgstr "Ajouter Champ 3" + +#: eeschema/dialog_build_BOM.cpp:306 +msgid "Add Field 4" +msgstr "Ajouter Champ 4" + +#: eeschema/dialog_build_BOM.cpp:310 +msgid "Add Field 5" +msgstr "Ajouter Champ 5" + +#: eeschema/dialog_build_BOM.cpp:314 +msgid "Add Field 6" +msgstr "Ajouter Champ 6" + +#: eeschema/dialog_build_BOM.cpp:318 +msgid "Add Field 7" +msgstr "Ajouter Champ 7" + +#: eeschema/dialog_build_BOM.cpp:322 +msgid "Add Field 8" +msgstr "Ajouter Champ 8" + +#: eeschema/dialog_build_BOM.cpp:437 msgid "Bill of material:" msgstr "Liste du materiel:" -#: eeschema/dialog_build_BOM.cpp:592 +#: eeschema/dialog_build_BOM.cpp:597 #, c-format msgid "" "\n" @@ -7931,7 +7787,7 @@ msgstr "" "\n" "#Glob labels ( ordre = Numéro de feuiller ) nombre = %d\n" -#: eeschema/dialog_build_BOM.cpp:602 +#: eeschema/dialog_build_BOM.cpp:607 #, c-format msgid "" "\n" @@ -7941,6 +7797,151 @@ msgstr "" "\n" "#Glob labels ( ordre = Alphab. ) nombre = %d\n" +#: eeschema/menubar.cpp:37 +msgid "&Load Schematic Project" +msgstr "&Charger Projet schématique" + +#: eeschema/menubar.cpp:38 +msgid "Load a schematic project (Schematic, libraries...)" +msgstr "Charger un projet schématique complet (schemas, librairies...)" + +#: eeschema/menubar.cpp:43 +msgid "&Reload the current sheet" +msgstr "&Recharger la feuille courante" + +#: eeschema/menubar.cpp:44 +msgid "Load or reload a schematic file from file into the current sheet" +msgstr "Charger ou recharger un schema a partir d'un fichier dans la feuille courante" + +#: eeschema/menubar.cpp:50 +msgid "&Save Schematic Project" +msgstr "&Sauver le Projet schématique" + +#: eeschema/menubar.cpp:51 +msgid "Save all" +msgstr "Tout sauver" + +#: eeschema/menubar.cpp:57 +msgid "Save &Current sheet" +msgstr "Sauver &Feuille active" + +#: eeschema/menubar.cpp:58 +msgid "Save current sheet only" +msgstr "Sauver la feuille active uniquement" + +#: eeschema/menubar.cpp:63 +msgid "Save Current sheet &as.." +msgstr "Sauver la feuille &active sous.." + +#: eeschema/menubar.cpp:64 +msgid "Save current sheet as.." +msgstr "Sauver la feuille active sous un autre nom" + +#: eeschema/menubar.cpp:76 +msgid "Plot PostScript" +msgstr "Tracé Postscript" + +#: eeschema/menubar.cpp:76 +msgid "Plotting in PostScript format" +msgstr "Générer un tracé en format Postscript" + +#: eeschema/menubar.cpp:81 +msgid "Plot HPGL" +msgstr "Tracé HPGL" + +#: eeschema/menubar.cpp:81 +msgid "Plotting in HPGL format" +msgstr "Générer un tracé en format HPGL" + +#: eeschema/menubar.cpp:86 +msgid "Plot SVG" +msgstr "Tracé SVG" + +#: eeschema/menubar.cpp:86 +msgid "Plotting in SVG format" +msgstr "Générer un tracé en format SVG" + +#: eeschema/menubar.cpp:93 +msgid "Plot to Clipboard" +msgstr "Tracé dans Presse papier" + +#: eeschema/menubar.cpp:93 +msgid "Export drawings to clipboard" +msgstr " Export du dessin dans le presse-papier" + +#: eeschema/menubar.cpp:100 +msgid "Plot HPGL, PostScript, SVG" +msgstr "Tracer en format HPGL, POSTSCRIPT ou SVG" + +#: eeschema/menubar.cpp:103 +msgid "Quit Eeschema" +msgstr "Quitter Eeschema" + +#: eeschema/menubar.cpp:128 +msgid "Setting colors ..." +msgstr "Choisir les couleurs d'affichage" + +#: eeschema/menubar.cpp:132 +#: gerbview/tool_gerber.cpp:107 +msgid "&Options" +msgstr "&Options" + +#: eeschema/menubar.cpp:140 +msgid "&Save Eeschema Setup" +msgstr "&Sauver Eeschema Options" + +#: eeschema/menubar.cpp:141 +msgid "Save options in .pro" +msgstr "Sauver les options en .pro" + +#: eeschema/menubar.cpp:152 +msgid "Open the eeschema manual" +msgstr "Ouvrir la documentation de eeschema" + +#: eeschema/annotate_dialog.cpp:122 +msgid "Hierarchy" +msgstr "Hiérarchie" + +#: eeschema/annotate_dialog.cpp:123 +msgid "Current sheet" +msgstr "Feuille active" + +#: eeschema/annotate_dialog.cpp:124 +msgid "annotate:" +msgstr "Numérotation:" + +#: eeschema/annotate_dialog.cpp:129 +msgid "all components" +msgstr "Tous les composants" + +#: eeschema/annotate_dialog.cpp:130 +msgid "new components only" +msgstr "Nouveaux composants seulement" + +#: eeschema/annotate_dialog.cpp:131 +msgid "select items:" +msgstr "Sélection:" + +#: eeschema/annotate_dialog.cpp:136 +msgid "by position" +msgstr "par position" + +#: eeschema/annotate_dialog.cpp:137 +msgid "by value" +msgstr "par valeur" + +#: eeschema/annotate_dialog.cpp:138 +msgid "sorting:" +msgstr "Tri:" + +#: eeschema/annotate_dialog.cpp:145 +msgid "&Annotate" +msgstr "Numérot&ation" + +#: eeschema/annotate_dialog.cpp:150 +msgid "&Del Annotate" +msgstr "&Dénumérotation" + #: cvpcb/dialog_display_options.cpp:141 #: cvpcb/options.cpp:159 msgid "Pad &Num" @@ -8313,7 +8314,7 @@ msgid "You must choose a PDF viewer before use this option" msgstr "Vous devez choisir un Visualisateur PDF avant d'utiliser cette option" #: kicad/preferences.cpp:97 -#: common/gestfich.cpp:574 +#: common/gestfich.cpp:586 msgid "Prefered Editor:" msgstr "Editeur préféré:" @@ -8702,23 +8703,6 @@ msgstr "GerbView (Visualisateur Gerber)" msgid "Run Python Script" msgstr "Exécuter le Script Python" -#: gerbview/files.cpp:81 -msgid "Not yet available..." -msgstr "non encore disponible" - -#: gerbview/files.cpp:128 -msgid "GERBER PLOT files:" -msgstr "Fichiers tracé GERBER:" - -#: gerbview/files.cpp:175 -#: gerbview/readgerb.cpp:252 -msgid "D CODES files:" -msgstr "fichiers D CODES:" - -#: gerbview/files.cpp:206 -msgid "Gerber files:" -msgstr "Fichiers Gerber:" - #: gerbview/reglage.cpp:121 msgid "Drill File Ext:" msgstr "Ext. Fichier de percage" @@ -8852,11 +8836,6 @@ msgstr "Nom Fichier C.I.:" msgid "Ok to change the existing file ?" msgstr "D'accord pour changer le fichier existant ?" -#: gerbview/readgerb.cpp:234 -#, c-format -msgid "%d errors while reading gerber file [%s]" -msgstr "%d erreurs pendant lecture fichier gerber [%s]" - #: gerbview/rs274x.cpp:285 #, c-format msgid "Command <%c%c> ignored by Gerbview" @@ -8870,28 +8849,42 @@ msgstr "Trop de fichiers inclus!!" msgid "GerbView is already running. Continue?" msgstr "Gerbview est est cours d'exécution. Continuer ?" +#: 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/files.cpp:175 +#: gerbview/readgerb.cpp:252 +msgid "D CODES files:" +msgstr "fichiers D CODES:" + #: gerbview/tool_gerber.cpp:35 -msgid "Clear and Load gerber file" +msgid "Clear and Load Gerber file" msgstr "Effacer et charger fichier Gerber" #: gerbview/tool_gerber.cpp:36 -msgid "Clear all layers and Load new gerber file" +msgid "Clear all layers and Load new Gerber file" msgstr "Effacer toutes les couches et charger un fichier Gerber" #: gerbview/tool_gerber.cpp:40 -msgid "Load gerber file" +msgid "Load Gerber file" msgstr "Charger Fichier Gerber" #: gerbview/tool_gerber.cpp:41 -msgid "Load new gerber file on currrent layer" +msgid "Load new Gerber file on currrent layer" msgstr "Charger Fichier Gerber sur couche courante" #: gerbview/tool_gerber.cpp:45 -msgid "Inc Layer and load gerber file" +msgid "Inc Layer and load Gerber file" msgstr "Inc couche et charge Fichier Gerber" #: gerbview/tool_gerber.cpp:46 -msgid "Increment layer number, and Load gerber file" +msgid "Increment layer number, and Load Gerber file" msgstr "Incrémenter numéro de couche, et charger fichier Gerber" #: gerbview/tool_gerber.cpp:50 @@ -8970,10 +8963,6 @@ msgstr " S msgid " Select how items are displayed" msgstr "Sélectionner comment les éléments sont a afficher" -#: gerbview/tool_gerber.cpp:119 -msgid "&Save Gerbview Setup" -msgstr "&Sauver Gerbview Options" - #: gerbview/tool_gerber.cpp:120 msgid "Save application preferences" msgstr "Sauver préférences" @@ -9054,6 +9043,11 @@ msgstr "Afficher lignes en contour" msgid "Show dcode number" msgstr "Afficher le n° de DCode" +#: gerbview/readgerb.cpp:234 +#, c-format +msgid "%d errors while reading Gerber file [%s]" +msgstr "%d erreurs pendant lecture fichier gerber [%s]" + #: common/get_component_dialog.cpp:105 msgid "History list:" msgstr "Historique:" @@ -9367,7 +9361,7 @@ msgstr "Cor msgid "Language" msgstr "Langage" -#: common/gestfich.cpp:569 +#: common/gestfich.cpp:581 msgid "No default editor found, you must choose it" msgstr "Pas d'éditeur par défaut trouvé, vous devez en choisir un" @@ -9838,7 +9832,7 @@ msgstr "Recherche" msgid "EESchema Erc" msgstr "EESchema Erc" -#: eeschema/annotate_dialog.h:48 +#: eeschema/annotate_dialog.h:53 msgid "EESchema Annotation" msgstr "Numérotation des composants" diff --git a/libs.linux b/libs.linux index 569aa90158..885175a1ee 100644 --- a/libs.linux +++ b/libs.linux @@ -14,7 +14,7 @@ STD_INSTALL = 1 ifeq ($(STD_INSTALL), 1) PREFIX = /usr -KICAD_BIN = $(PREFIX)/bin +KICAD_BIN = $(PREFIX)/linux KICAD_PLUGINS = $(PREFIX)/lib/kicad/plugins KICAD_DOCS=$(PREFIX)/share/doc/kicad KICAD_DATA=$(PREFIX)/share/kicad @@ -23,8 +23,8 @@ KICAD_LIBRARY=$(KICAD_DATA)/library KICAD_INTERNAT=$(KICAD_DATA)/internat KICAD_TEMPLATE=$(KICAD_DATA)/template -# used by myself (JP Charras) to build a staticcaly linked distribution intalled in /usr/local (with STD_INSTALL = 0) else +# used by myself (JP Charras) to build a statically linked distribution intalled in /usr/local (with STD_INSTALL = 0) PREFIX = /usr/local/linux KICAD_BIN = $(PREFIX)/bin KICAD_PLUGINS = $(PREFIX)/linux/plugins @@ -38,7 +38,6 @@ endif # http://www.gnu.org/software/autoconf/manual/make/Catalogue-of-Rules.html#Catalogue-of-Rules CXX = g++ -LD = g++ SRCSUFF = .cpp @@ -46,8 +45,8 @@ OBJSUFF = .o FINAL = 1 -# turn on debugging for all executables, only tested without KICAD_PYTHON -DEBUG = 1 +# turn on/OFF debugging for all executables, only tested without KICAD_PYTHON +DEBUG = 0 # common CPPFLAGS to all components, further CPPFLAGS customization in @@ -67,9 +66,17 @@ endif # You must uncomment these lines for static link (or build with "make -f makefile.gtk KICAD_STATIC_LINK=1") # dynamic link is less difficult than static link and is what you would normally want # to use if kicad is running only on your system or one with same level of libraries. -#ifndef KICAD_PYTHON -#KICAD_STATIC_LINK = 1 -#endif +ifndef KICAD_PYTHON +ifeq ($(STD_INSTALL), 0) +KICAD_STATIC_LINK = 1 +endif +endif + +ifeq ($(KICAD_STATIC_LINK), 1) +LD = gcc +else +LD = g++ +endif ifdef KICAD_PYTHON PYTHON_VERSION=2.5 diff --git a/libs.win b/libs.win index 767110ae46..c70c06ae9b 100644 --- a/libs.win +++ b/libs.win @@ -1,4 +1,4 @@ -# File: winmake.env +# File: libs.win #binaries path: KICAD_BIN = /f/kicad/winexe @@ -12,6 +12,7 @@ KICAD_BIN = /f/kicad/winexe # DLL use wxWin STATIC 0 0 1 # +#comment this for static wxWidgets link #WXUSINGDLL = 1 #Define the wxWidget path (if not found in environment variables): @@ -21,9 +22,6 @@ endif LIBVERSION = 2.8 -#comment this for static wxWidgets link -#WXUSINGDLL = 1 - # You must comment or uncomment this line to disable/enable python support #KICAD_PYTHON = 1 diff --git a/news.txt b/news.txt index 7545eccf1b..0224c919e2 100644 --- a/news.txt +++ b/news.txt @@ -1,3 +1,10 @@ +************************************************************** +Update 02 jul 2007 +All: + Window version only: + problem solved in autoinstall package fo XP (help files and others filse not found) + This problem was already solved, but changes were lost in last release. + ************************************************************** Update 02 jul 2007 pcbnew: diff --git a/pcbnew/router.cpp b/pcbnew/router.cpp index 43bfdbc5a9..9c5891e80b 100644 --- a/pcbnew/router.cpp +++ b/pcbnew/router.cpp @@ -17,12 +17,6 @@ #define PSCALE 1 -/* routines externes */ -int ReadListeSegmentDescr(wxDC * DC, FILE * File, - TRACK * PtSegm,DrawStructureType ItemType, - int * LineNum, int NumSegm); - - /* routines internes */ static void Out_Pads(BOARD * Pcb, FILE * outfile); static int GenEdges(BOARD * Pcb, FILE * outfile); @@ -513,8 +507,14 @@ void WinEDA_PcbFrame::ReadAutoroutedTracks(wxDC * DC) { char Line[1024]; wxString FullFileName, msg; -int LineNum = 0, nbtracks, NbTrack = 0; +int LineNum = 0, NbTrack = 0, NetCode = 0; FILE * File; +TRACK * NewTrack; +SEGVIA * NewVia; +int track_count, track_layer, image, track_width; +int via_layer1, via_layer2, via_size; +wxPoint track_start, track_end; +int max_layer = m_Pcb->m_BoardSettings->m_CopperLayerCount; /* Calcule du nom du fichier intermediaire de communication */ FullFileName = m_CurrentScreen->m_FileName; @@ -532,37 +532,85 @@ FILE * File; Affiche_Message(msg); } - nbtracks = 0; + setlocale(LC_NUMERIC, "C"); + + track_width = g_DesignSettings.m_CurrentTrackWidth; + via_size = g_DesignSettings.m_CurrentViaSize; while( GetLine(File, Line, &LineNum ) != NULL ) - { - if(strnicmp(Line,"$EndPCB",6) == 0) break; + { + char ident = Line[0]; + switch ( ident ) + { + case 'j': // Header, not used + break; - if(strnicmp(Line,"$TRACK",6) == 0) - { - TRACK * StartTrack = m_Pcb->m_Track; - - for( ;StartTrack != NULL; StartTrack = (TRACK*)StartTrack->Pnext) - { - if( StartTrack->Pnext == NULL ) break; - } - - nbtracks = ReadListeSegmentDescr(DC, File, StartTrack, TYPETRACK, - &LineNum, NbTrack); - m_Pcb->m_NbSegmTrack += nbtracks; - break; - } - } + case 'R': // Net record + sscanf(Line+2, "%d", & NetCode); + break; + + case 'V': // via record: fmt = V symbol pos_x pos_y layer1 layer2 + sscanf(Line+2, "%d %d %d %d %d", & image, + & track_start.x, & track_start.y, & via_layer1, &via_layer2); + via_layer1--; via_layer2--; + if ( via_layer1 == max_layer-1 ) via_layer1 = CMP_N; + if ( via_layer2 == max_layer-1 ) via_layer2 = CMP_N; + NewVia = new SEGVIA(m_Pcb); + NewVia->m_Start = NewVia->m_End = track_start; + NewVia->m_Width = via_size; + NewVia->m_Layer = via_layer1 + (via_layer2<<4); + if ( NewVia->m_Layer == 0x0F || NewVia->m_Layer == 0xF0) + NewVia->m_Shape = VIA_NORMALE; + else NewVia->m_Shape = VIA_ENTERREE; + NewVia->Insert(m_Pcb, NULL); + NbTrack++; + break; + + case 'T': // Track list start: fmt = T image layer t_count + sscanf(Line+2, "%d %d %d", & image, & track_layer, & track_count); + track_layer--; + if ( track_layer == max_layer-1 ) track_layer = CMP_N; + // Read corners: fmt = C x_pos y_pos + for ( int ii = 0; ii < track_count; ii++ ) + { + if( GetLine(File, Line, &LineNum ) != NULL ) + { + if ( Line[0] != 'C' ) break; + if ( ii == 0 ) + sscanf(Line+2, "%d %d", & track_start.x, & track_start.y); + else + { + sscanf(Line+2, "%d %d", & track_end.x, & track_end.y); + NewTrack = new TRACK(m_Pcb); + NewTrack->m_Width = track_width; + NewTrack->m_Layer = track_layer; + NewTrack->m_Start = track_start; + NewTrack->m_End = track_end; + track_start = track_end; + NewTrack->Insert(m_Pcb, NULL); + NbTrack++; + } + } + else break; + } + break; + + default: + break; + } + } fclose(File); - if( nbtracks == 0 ) DisplayError(this, wxT("Warning: No tracks"), 10); + setlocale(LC_NUMERIC, ""); + + if( NbTrack == 0 ) DisplayError(this, wxT("Warning: No tracks"), 10); else - { - m_Pcb->m_Status_Pcb = 0; - m_CurrentScreen->SetModify(); - } + { + m_Pcb->m_Status_Pcb = 0; + m_CurrentScreen->SetModify(); + } Compile_Ratsnest(DC, TRUE); - if( nbtracks ) m_CurrentScreen->SetRefreshReq(); + if( NbTrack ) m_CurrentScreen->SetRefreshReq(); } diff --git a/version.txt b/version.txt index d8d0b54b5f..e43b0ac867 100644 --- a/version.txt +++ b/version.txt @@ -1,4 +1,4 @@ release version: -02 jul 2007 +09 jul 2007 files (.zip,.tgz): -kicad-2007-07-02 +kicad-2007-07-09