From 05e69660a092ed10669800b37848e68047e9a519 Mon Sep 17 00:00:00 2001 From: CHARRAS Date: Fri, 9 Nov 2007 14:42:10 +0000 Subject: [PATCH] minor changes before creating a stable version --- how-to-build-kicad.txt | 25 +- include/build_version.h | 2 +- internat/fr/kicad.mo | Bin 133972 -> 134139 bytes internat/fr/kicad.po | 1571 +++++++++++++++++------------------- libs.linux | 36 +- pcbnew/reglage.cpp.notused | 281 ------- version.txt | 4 +- 7 files changed, 804 insertions(+), 1115 deletions(-) delete mode 100644 pcbnew/reglage.cpp.notused diff --git a/how-to-build-kicad.txt b/how-to-build-kicad.txt index ee86fbd57e..d4aa085b71 100644 --- a/how-to-build-kicad.txt +++ b/how-to-build-kicad.txt @@ -1,6 +1,6 @@ How to build kicad: -kicad do not use configure (not yet...) +kicad do not use configure (Use of Cmake is in progress) it is compiled with make. kicad needs wxWidgets (the multi platform G.U.I.) @@ -31,14 +31,20 @@ make install ( libGL.a et libGLU.a are copied in /usr/local/lib, and header in / kicad compilation: in kicad-dev: - Have a look to libs.linux (you can edit this file if you have problems) - Currently libs.linux uses wxWidgets 2.7.1 build (see below for suggested configure command) + Have a look to libs.linux (you can/must edit this file if you have problems) + Currently libs.linux uses wxWidgets 2.8.6 build (see below for suggested configure command) + lines to edit: + STD_INSTALL = 1 + which can be (see comments in libs.linux) + STD_INSTALL = 1 + + after libs.linux edition: run make -f makefile.gtk Windows compilation: kicad is build with mingw and msys. -Currently libs.linux uses wxWidgets 2.8.1 (see below for suggested configure command) +Currently libs.win uses wxWidgets 2.8.6 (see below for suggested configure command) install mingw and msys ( see mingw.org ) (opengl libs are included in mingw or windows) @@ -47,21 +53,20 @@ Under msys: (Warning: make.exe utility is sometime renamed mingw32-make.exe in install process of msys.) -Build wxWidgets (currently version 2.8.1) +Build wxWidgets (currently version 2.8.6) See below for suggested configure command, then make In include/wx/msw/setup.h, check (and edit if needed) the defines : #define wxUSE_GLCANVAS 1 - #define WXWIN_COMPATIBILITY_2_4 0 #define wxUSE_MOUSEWHEEL 1 // Include mouse wheel support #define wxUSE_HOTKEY 0 // Hotkey support (currently Windows only) Exit msys. -Set environment variable WXWIN ( something as wxwin=/d/wxWidgets-2.8.1 -for a wxWidget installed in d:\wxWidgets-2.8.1) +Set environment variable WXWIN ( something as wxwin=/d/wxWidgets-2.8.6 +for a wxWidget installed in d:\wxWidgets-2.8.6) -Have a look to libs.win (Currently this file handle wxWidgets 2.8.1) +Have a look to libs.win (Currently this file handle wxWidgets 2.8.6) Under msys: in kicad-dev: @@ -101,7 +106,7 @@ Patch wxWidgets wxGTK version: ************************************************************************************* Patch for printing wide traces that were showing missing rounded end caps: -wxGTK-2.8.1/src/generic/dcpsg.cpp +wxGTK-2.8.6/src/generic/dcpsg.cpp line 1634 PsPrint( "%%EndProlog\n" ); diff --git a/include/build_version.h b/include/build_version.h index 67db527673..d2f39577d3 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-11-05)")) + (wxT("(2007-11-09)")) #endif ; diff --git a/internat/fr/kicad.mo b/internat/fr/kicad.mo index 0ebd5881277d373975765665ab528ad4aabb0613..e023d45a22954ef04d2a34db0484d6f589455e8c 100644 GIT binary patch delta 46782 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 xrDk29Q4{*>3t9?DP{{xQ delta 46586 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\n" "Language-Team: kicad team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" @@ -63,10 +63,10 @@ msgstr "Pcbnew est est cours d'ex #: pcbnew/librairi.cpp:551 #: pcbnew/librairi.cpp:754 #: pcbnew/files.cpp:326 +#: pcbnew/export_gencad.cpp:83 #: pcbnew/gen_modules_placefile.cpp:87 #: pcbnew/gen_modules_placefile.cpp:98 #: pcbnew/gen_modules_placefile.cpp:251 -#: pcbnew/export_gencad.cpp:83 #: eeschema/plothpgl.cpp:560 #: eeschema/plotps.cpp:389 #: cvpcb/genequiv.cpp:42 @@ -688,10 +688,6 @@ msgstr "&Ex #: pcbnew/dialog_netlist.cpp:178 #: pcbnew/dialog_drc.cpp:201 #: eeschema/plotps.cpp:208 -#: 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/dialog_print.cpp:225 #: share/svg_print.cpp:222 msgid "&Close" @@ -850,7 +846,7 @@ msgstr "Inclure couche Edge" #: pcbnew/pcbtexte.cpp:116 #: pcbnew/modedit_onclick.cpp:203 #: pcbnew/modedit_onclick.cpp:235 -#: pcbnew/set_color.cpp:280 +#: pcbnew/set_color.cpp:357 #: pcbnew/onrightclick.cpp:146 #: pcbnew/onrightclick.cpp:160 #: pcbnew/globaleditpad.cpp:108 @@ -881,7 +877,7 @@ msgstr "Annuler" #: pcbnew/muonde.cpp:348 #: pcbnew/dialog_edit_module.cpp:118 #: pcbnew/pcbtexte.cpp:111 -#: pcbnew/set_color.cpp:275 +#: pcbnew/set_color.cpp:353 #: pcbnew/sel_layer.cpp:158 #: pcbnew/sel_layer.cpp:316 #: eeschema/sheetlab.cpp:93 @@ -1049,12 +1045,12 @@ msgstr "Offset Y" #: eeschema/symbtext.cpp:174 #: eeschema/sheet.cpp:221 #: eeschema/dialog_options.cpp:274 -#: eeschema/dialog_edit_label.cpp:176 +#: eeschema/dialog_edit_label.cpp:174 #: eeschema/dialog_edit_component_in_lib.cpp:218 #: eeschema/dialog_create_component.cpp:195 -#: eeschema/dialog_edit_component_in_schematic.cpp:243 #: eeschema/dialog_cmp_graphic_properties.cpp:178 #: eeschema/dialog_build_BOM.cpp:346 +#: eeschema/dialog_edit_component_in_schematic.cpp:240 #: eeschema/pinedit-dialog.cpp:308 #: cvpcb/dialog_cvpcb_config.cpp:139 #: cvpcb/dialog_display_options.cpp:186 @@ -1075,14 +1071,18 @@ msgstr "&OK" #: pcbnew/dialog_track_options.cpp:185 #: eeschema/symbtext.cpp:178 #: eeschema/plothpgl.cpp:274 +#: eeschema/annotate_dialog.cpp:154 #: eeschema/sheet.cpp:216 #: eeschema/dialog_options.cpp:278 +#: eeschema/dialog_edit_label.cpp:179 #: eeschema/dialog_edit_component_in_lib.cpp:214 #: eeschema/dialog_create_component.cpp:200 -#: eeschema/dialog_cmp_graphic_properties.cpp:182 #: eeschema/netlist_control.cpp:115 #: eeschema/netlist_control.cpp:268 +#: eeschema/dialog_cmp_graphic_properties.cpp:182 #: eeschema/dialog_build_BOM.cpp:350 +#: eeschema/dialog_erc.cpp:218 +#: eeschema/dialog_edit_component_in_schematic.cpp:232 #: eeschema/pinedit-dialog.cpp:304 #: cvpcb/dialog_display_options.cpp:191 #: gerbview/select_layers_to_pcb.cpp:287 @@ -1204,106 +1204,6 @@ msgstr "S msgid "Component [%s]: footprint <%s> not found" msgstr "Composant [%s]: Module <%sw non trouvé en librairies" -#: pcbnew/reglage.cpp:101 -#: pcbnew/dialog_setup_libs.cpp:97 -#: eeschema/eestatus.cpp:111 -#: eeschema/dialog_eeschema_config.cpp:105 -#: cvpcb/dialog_cvpcb_config.cpp:76 -#: gerbview/reglage.cpp:90 -msgid "from " -msgstr "De " - -#: pcbnew/reglage.cpp:108 -#: pcbnew/dialog_setup_libs.cpp:153 -#: eeschema/eestatus.cpp:116 -#: eeschema/dialog_eeschema_config.cpp:161 -#: cvpcb/dialog_cvpcb_config.cpp:131 -#: cvpcb/dialog_display_options.cpp:177 -msgid "Save Cfg" -msgstr "Sauver config" - -#: pcbnew/reglage.cpp:112 -#: pcbnew/dialog_setup_libs.cpp:175 -#: eeschema/eestatus.cpp:120 -#: eeschema/dialog_eeschema_config.cpp:196 -#: cvpcb/dialog_cvpcb_config.cpp:170 -#: cvpcb/dialog_cvpcb_config.cpp:202 -msgid "Del" -msgstr "Supprimer" - -#: pcbnew/reglage.cpp:116 -#: pcbnew/dialog_setup_libs.cpp:179 -#: eeschema/eestatus.cpp:124 -#: eeschema/dialog_eeschema_config.cpp:200 -#: eeschema/edit_component_in_lib.cpp:233 -#: eeschema/edit_component_in_lib.cpp:312 -#: cvpcb/dialog_cvpcb_config.cpp:174 -#: cvpcb/dialog_cvpcb_config.cpp:206 -msgid "Add" -msgstr "Ajouter" - -#: pcbnew/reglage.cpp:120 -#: pcbnew/dialog_setup_libs.cpp:183 -#: eeschema/eestatus.cpp:128 -#: eeschema/dialog_eeschema_config.cpp:204 -#: cvpcb/dialog_cvpcb_config.cpp:178 -#: cvpcb/dialog_cvpcb_config.cpp:210 -msgid "Ins" -msgstr "Insérer" - -#: pcbnew/reglage.cpp:124 -msgid "Lib Modules:" -msgstr "Lib Modules:" - -#: pcbnew/reglage.cpp:148 -#: pcbnew/dialog_setup_libs.cpp:159 -#: eeschema/eestatus.cpp:148 -#: eeschema/dialog_eeschema_config.cpp:180 -#: cvpcb/dialog_cvpcb_config.cpp:151 -msgid "Files ext:" -msgstr "Ext. Fichiers" - -#: pcbnew/reglage.cpp:151 -#: pcbnew/dialog_setup_libs.cpp:216 -msgid "Board ext: " -msgstr "Board ext: " - -#: pcbnew/reglage.cpp:155 -#: pcbnew/dialog_setup_libs.cpp:220 -msgid "Cmp ext: " -msgstr "Cmp ext: " - -#: pcbnew/reglage.cpp:159 -#: pcbnew/dialog_setup_libs.cpp:224 -msgid "Lib ext: " -msgstr "Lib ext: " - -#: pcbnew/reglage.cpp:163 -#: pcbnew/dialog_setup_libs.cpp:228 -msgid "Net ext: " -msgstr "Net ext: " - -#: pcbnew/reglage.cpp:169 -#: pcbnew/dialog_setup_libs.cpp:199 -msgid "Lib Modules Dir:" -msgstr "Repertoire Lib Modules:" - -#: pcbnew/reglage.cpp:176 -#: pcbnew/dialog_setup_libs.cpp:206 -#: cvpcb/menucfg.cpp:91 -msgid "Module Doc File:" -msgstr "Fichiers Doc des Modules" - -#: pcbnew/reglage.cpp:258 -#: pcbnew/dialog_setup_libs.cpp:367 -msgid "library files:" -msgstr "Fichiers Librairies" - -#: pcbnew/reglage.cpp:279 -#: pcbnew/dialog_setup_libs.cpp:390 -msgid "Library exists! No Change" -msgstr "Librairie existante! Pas de changement" - #: pcbnew/editrout.cpp:116 #: pcbnew/edit_track_width.cpp:117 msgid "Edit All Tracks and Vias Sizes" @@ -1326,8 +1226,8 @@ msgstr "Supprimer Net ?" #: pcbnew/dialog_netlist.cpp:133 #: pcbnew/class_board_item.cpp:76 #: eeschema/dialog_create_component.cpp:164 -#: eeschema/onrightclick.cpp:317 #: eeschema/edit_component_in_schematic.cpp:745 +#: eeschema/onrightclick.cpp:317 #: eeschema/eelayer.h:152 msgid "Reference" msgstr "Référence" @@ -1453,7 +1353,7 @@ msgstr "Ne pas monter Zones" #: pcbnew/pcbframe.cpp:412 #: pcbnew/tool_pcb.cpp:361 -#: pcbnew/set_color.h:344 +#: pcbnew/set_color.h:423 msgid "Show Zones" msgstr "Monter Zones" @@ -1769,7 +1669,7 @@ msgstr "Zoom " #: pcbnew/tool_pcb.cpp:585 #: eeschema/eelayer.cpp:223 -#: pcbnew/set_color.h:335 +#: pcbnew/set_color.h:414 #: eeschema/eelayer.h:209 #: gerbview/set_color.h:246 msgid "Grid" @@ -1916,9 +1816,9 @@ msgstr "Texte Pcb" #: pcbnew/class_board_item.cpp:80 #: pcbnew/class_text_mod.cpp:345 #: pcbnew/class_edge_mod.cpp:286 +#: eeschema/edit_component_in_schematic.cpp:784 #: eeschema/component_class.cpp:55 #: eeschema/onrightclick.cpp:316 -#: eeschema/edit_component_in_schematic.cpp:784 #: eeschema/eelayer.h:158 msgid "Value" msgstr "Valeur" @@ -2122,7 +2022,7 @@ msgstr "Propri #: pcbnew/dialog_edit_module.cpp:289 #: pcbnew/pcbtexte.cpp:176 #: eeschema/dialog_options.cpp:229 -#: eeschema/dialog_edit_component_in_schematic.cpp:182 +#: eeschema/dialog_edit_component_in_schematic.cpp:180 #: eeschema/onrightclick.cpp:305 msgid "Normal" msgstr "Normal" @@ -2480,7 +2380,7 @@ msgstr "Forme du per #: pcbnew/clean.cpp:462 #: eeschema/dialog_erc.cpp:192 #: eeschema/dialog_erc.cpp:196 -#: eeschema/dialog_edit_component_in_schematic.cpp:172 +#: eeschema/dialog_edit_component_in_schematic.cpp:171 msgid "0" msgstr "0" @@ -2489,12 +2389,12 @@ msgid "90" msgstr "90" #: pcbnew/dialog_pad_edit.cpp:188 -#: eeschema/dialog_edit_component_in_schematic.cpp:175 +#: eeschema/dialog_edit_component_in_schematic.cpp:174 msgid "-90" msgstr "-90" #: pcbnew/dialog_pad_edit.cpp:189 -#: eeschema/dialog_edit_component_in_schematic.cpp:174 +#: eeschema/dialog_edit_component_in_schematic.cpp:173 msgid "180" msgstr "180" @@ -3081,7 +2981,6 @@ msgstr "Exclure les trac #: pcbnew/pcbplot.cpp:266 #: eeschema/plotps.cpp:191 -#: common/svg_print.cpp:197 #: share/dialog_print.cpp:174 #: share/svg_print.cpp:200 msgid "Print Sheet Ref" @@ -3318,8 +3217,8 @@ msgid "Auto Save (minuts):" msgstr "Sauveg. Auto (min)" #: pcbnew/dialog_general_options.cpp:315 -#: eeschema/dialog_cmp_graphic_properties.cpp:151 #: eeschema/netlist_control.cpp:94 +#: eeschema/dialog_cmp_graphic_properties.cpp:151 #: eeschema/dialog_build_BOM.cpp:285 #: share/dialog_print.cpp:167 msgid "Options:" @@ -3594,33 +3493,89 @@ msgstr "Effacement contour" msgid "Set Width" msgstr "Ajuste Epaiss" -#: pcbnew/set_color.cpp:149 -msgid "Colors:" -msgstr "Couleurs:" +#: pcbnew/dialog_setup_libs.cpp:97 +#: eeschema/dialog_eeschema_config.cpp:105 +#: cvpcb/dialog_cvpcb_config.cpp:76 +#: gerbview/reglage.cpp:90 +msgid "from " +msgstr "De " -#: pcbnew/set_color.cpp:264 -#: gerbview/set_color.cpp:236 -msgid "Show All" -msgstr "Tout Afficher" +#: pcbnew/dialog_setup_libs.cpp:153 +#: eeschema/dialog_eeschema_config.cpp:161 +#: cvpcb/dialog_cvpcb_config.cpp:131 +#: cvpcb/dialog_display_options.cpp:177 +msgid "Save Cfg" +msgstr "Sauver config" -#: pcbnew/set_color.cpp:270 -#: gerbview/set_color.cpp:241 -msgid "Show None" -msgstr "Rien Afficher" +#: pcbnew/dialog_setup_libs.cpp:159 +#: eeschema/dialog_eeschema_config.cpp:180 +#: cvpcb/dialog_cvpcb_config.cpp:151 +msgid "Files ext:" +msgstr "Ext. Fichiers" -#: pcbnew/set_color.cpp:285 -#: gerbview/set_color.cpp:257 -msgid "Apply" -msgstr "Appliquer" +#: pcbnew/dialog_setup_libs.cpp:175 +#: eeschema/dialog_eeschema_config.cpp:196 +#: cvpcb/dialog_cvpcb_config.cpp:170 +#: cvpcb/dialog_cvpcb_config.cpp:202 +msgid "Del" +msgstr "Supprimer" + +#: pcbnew/dialog_setup_libs.cpp:179 +#: eeschema/dialog_eeschema_config.cpp:200 +#: eeschema/edit_component_in_lib.cpp:233 +#: eeschema/edit_component_in_lib.cpp:312 +#: cvpcb/dialog_cvpcb_config.cpp:174 +#: cvpcb/dialog_cvpcb_config.cpp:206 +msgid "Add" +msgstr "Ajouter" + +#: pcbnew/dialog_setup_libs.cpp:183 +#: eeschema/dialog_eeschema_config.cpp:204 +#: cvpcb/dialog_cvpcb_config.cpp:178 +#: cvpcb/dialog_cvpcb_config.cpp:210 +msgid "Ins" +msgstr "Insérer" #: pcbnew/dialog_setup_libs.cpp:191 -#: eeschema/eestatus.cpp:139 #: eeschema/dialog_eeschema_config.cpp:211 #: cvpcb/menucfg.cpp:231 #: cvpcb/dialog_cvpcb_config.cpp:185 msgid "Libraries" msgstr "Librairies" +#: pcbnew/dialog_setup_libs.cpp:199 +msgid "Lib Modules Dir:" +msgstr "Repertoire Lib Modules:" + +#: pcbnew/dialog_setup_libs.cpp:206 +#: cvpcb/menucfg.cpp:91 +msgid "Module Doc File:" +msgstr "Fichiers Doc des Modules" + +#: pcbnew/dialog_setup_libs.cpp:216 +msgid "Board ext: " +msgstr "Board ext: " + +#: pcbnew/dialog_setup_libs.cpp:220 +msgid "Cmp ext: " +msgstr "Cmp ext: " + +#: pcbnew/dialog_setup_libs.cpp:224 +msgid "Lib ext: " +msgstr "Lib ext: " + +#: pcbnew/dialog_setup_libs.cpp:228 +msgid "Net ext: " +msgstr "Net ext: " + +#: pcbnew/dialog_setup_libs.cpp:367 +msgid "library files:" +msgstr "Fichiers Librairies" + +#: pcbnew/dialog_setup_libs.cpp:390 +msgid "Library exists! No Change" +msgstr "Librairie existante! Pas de changement" + #: pcbnew/class_text_mod.cpp:345 msgid "Ref." msgstr "Ref." @@ -3805,6 +3760,30 @@ msgstr "X Pos" msgid "Y pos" msgstr "Y pos" +#: pcbnew/set_color.cpp:269 +#: pcbnew/set_color.cpp:296 +#: gerbview/set_color.cpp:241 +msgid "Show None" +msgstr "Rien Afficher" + +#: pcbnew/set_color.cpp:278 +#: gerbview/set_color.cpp:236 +msgid "Show All" +msgstr "Tout Afficher" + +#: pcbnew/set_color.cpp:290 +msgid "Switch on all of the copper layers" +msgstr "Affiche toutes les couches cuivre" + +#: pcbnew/set_color.cpp:299 +msgid "Switch off all of the copper layers" +msgstr "N'affiche pas les couches cuivre" + +#: pcbnew/set_color.cpp:361 +#: gerbview/set_color.cpp:257 +msgid "Apply" +msgstr "Appliquer" + #: pcbnew/onrightclick.cpp:83 #, c-format msgid "Track %.1f" @@ -4209,21 +4188,9 @@ msgstr "Pin %s (module %s) non trouv msgid "Locate Pin %s (module %s)" msgstr "Pin localisée %s (module %s)" -#: pcbnew/gen_modules_placefile.cpp:76 -msgid "No Modules for Automated Placement" -msgstr "Pas de Module pour placement Automatisé" - -#: pcbnew/gen_modules_placefile.cpp:110 -msgid "Component side place file:" -msgstr "Fichier placement coté composant:" - -#: pcbnew/gen_modules_placefile.cpp:113 -msgid "Copper side place file:" -msgstr "Fichier placement coté cuivre:" - -#: pcbnew/gen_modules_placefile.cpp:116 -msgid "Module count" -msgstr "Nb Modules" +#: pcbnew/export_gencad.cpp:69 +msgid "GenCAD file:" +msgstr "Fichier GenCAD:" #: pcbnew/class_edge_mod.cpp:283 msgid "Seg" @@ -4332,6 +4299,22 @@ msgstr "&Aide" msgid "Marker Error Text" msgstr "Texte du Marqueur d'erreurs" +#: pcbnew/gen_modules_placefile.cpp:76 +msgid "No Modules for Automated Placement" +msgstr "Pas de Module pour placement Automatisé" + +#: pcbnew/gen_modules_placefile.cpp:110 +msgid "Component side place file:" +msgstr "Fichier placement coté composant:" + +#: pcbnew/gen_modules_placefile.cpp:113 +msgid "Copper side place file:" +msgstr "Fichier placement coté cuivre:" + +#: pcbnew/gen_modules_placefile.cpp:116 +msgid "Module count" +msgstr "Nb Modules" + #: pcbnew/class_module.cpp:1207 msgid "Last Change" msgstr "Last Change" @@ -4795,20 +4778,16 @@ msgstr "Impossible de drag ce segment: trop de segments connect msgid "Unable to drag this segment: two collinear segments" msgstr "Impossible de drag ce segment: 2 segments alignés" -#: pcbnew/export_gencad.cpp:69 -msgid "GenCAD file:" -msgstr "Fichier GenCAD:" - #: pcbnew/move-drag_pads.cpp:251 #, c-format msgid "Delete Pad (module %s %s) " msgstr "Effacer Pad (module %s %s) " #: pcbnew/dialog_drc.cpp:141 -#: eeschema/dialog_erc.cpp:237 #: eeschema/dialog_edit_component_in_lib.cpp:166 #: eeschema/dialog_create_component.cpp:176 -#: eeschema/dialog_edit_component_in_schematic.cpp:204 +#: eeschema/dialog_erc.cpp:237 +#: eeschema/dialog_edit_component_in_schematic.cpp:201 msgid "Options" msgstr "Options" @@ -4849,7 +4828,6 @@ msgid "Report File" msgstr "Fichier rapport" #: pcbnew/dialog_drc.cpp:215 -#: common/svg_print.cpp:232 #: share/svg_print.cpp:232 msgid "Messages:" msgstr "Messages:" @@ -4858,47 +4836,6 @@ msgstr "Messages:" msgid "DRC Report file" msgstr "Fichier rapport de contrôle DRC:" -#: eeschema/annotate.cpp:181 -msgid "Previous Annotation will be deleted. Continue ?" -msgstr "La numérotation existante va être détruite, continuer?" - -#: eeschema/annotate.cpp:688 -#, c-format -msgid "item not annotated: %s%s" -msgstr "item non numéroté: %s%s" - -#: eeschema/annotate.cpp:692 -#, c-format -msgid "( unit %d)" -msgstr "( Unité %d)" - -#: eeschema/annotate.cpp:708 -#, c-format -msgid "Error item %s%s" -msgstr "Erreur item %s%s" - -#: eeschema/annotate.cpp:710 -#, c-format -msgid " unit %d and no more than %d parts" -msgstr " unité %d et plus que %d parts" - -#: eeschema/annotate.cpp:742 -#: eeschema/annotate.cpp:765 -#, c-format -msgid "Multiple item %s%s" -msgstr "Multipleélément %s%s" - -#: eeschema/annotate.cpp:747 -#: eeschema/annotate.cpp:769 -#, c-format -msgid " (unit %d)" -msgstr " ( Unité %d)" - -#: eeschema/annotate.cpp:785 -#, c-format -msgid "Diff values for %s%d%c (%s) and %s%d%c (%s)" -msgstr "Valeurs différentes pour %s%d%c (%s) et %s%d%c (%s)" - #: eeschema/schedit.cpp:282 msgid "Push/Pop Hierarchy" msgstr "Naviger dans Hiérarchie" @@ -5020,7 +4957,7 @@ msgid "Common to convert" msgstr "Commun a converti" #: eeschema/symbtext.cpp:167 -#: eeschema/dialog_edit_component_in_schematic.cpp:218 +#: eeschema/dialog_edit_component_in_schematic.cpp:215 #: eeschema/edit_component_in_lib.cpp:502 msgid "Vertical" msgstr "Vertical" @@ -5205,8 +5142,92 @@ msgstr "Le composant %s existe, Le changer ?" msgid "Component %s saved in %s" msgstr "Composant %s sauvé en %s" +#: 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" + +#: eeschema/annotate.cpp:182 +msgid "Previous Annotation will be deleted. Continue ?" +msgstr "La numérotation existante va être détruite, continuer?" + +#: eeschema/annotate.cpp:689 +#, c-format +msgid "item not annotated: %s%s" +msgstr "item non numéroté: %s%s" + +#: eeschema/annotate.cpp:693 +#, c-format +msgid "( unit %d)" +msgstr "( Unité %d)" + +#: eeschema/annotate.cpp:709 +#, c-format +msgid "Error item %s%s" +msgstr "Erreur item %s%s" + +#: eeschema/annotate.cpp:711 +#, c-format +msgid " unit %d and no more than %d parts" +msgstr " unité %d et plus que %d parts" + +#: eeschema/annotate.cpp:743 +#: eeschema/annotate.cpp:766 +#, c-format +msgid "Multiple item %s%s" +msgstr "Multipleélément %s%s" + +#: eeschema/annotate.cpp:748 +#: eeschema/annotate.cpp:770 +#, c-format +msgid " (unit %d)" +msgstr " ( Unité %d)" + +#: eeschema/annotate.cpp:786 +#, c-format +msgid "Diff values for %s%d%c (%s) and %s%d%c (%s)" +msgstr "Valeurs différentes pour %s%d%c (%s) et %s%d%c (%s)" + #: eeschema/sheet.cpp:162 -#: common/svg_print.cpp:224 #: share/svg_print.cpp:226 msgid "Filename:" msgstr "Nom Fichier:" @@ -5493,51 +5514,6 @@ msgstr "Ouvrir la documentation de eeschema" msgid "&Edit" msgstr "&Editer" -#: eeschema/dialog_erc.cpp:171 -#: eeschema/dialog_erc.cpp:202 -msgid "Erc File Report:" -msgstr "Fichier rapport d'erreurs:" - -#: eeschema/dialog_erc.cpp:176 -msgid "-> Total Errors: " -msgstr "-> Total Erreurs: " - -#: eeschema/dialog_erc.cpp:179 -msgid "-> Last Warnings: " -msgstr "-> Dern. Warnings: " - -#: eeschema/dialog_erc.cpp:183 -msgid "-> Last Errors: " -msgstr "-> Dern. Erreurs: " - -#: eeschema/dialog_erc.cpp:189 -msgid "0000" -msgstr "0000" - -#: eeschema/dialog_erc.cpp:205 -msgid "Write erc report" -msgstr "Rapport d'erreur" - -#: eeschema/dialog_erc.cpp:211 -msgid "&Test Erc" -msgstr "&Test Erc" - -#: eeschema/dialog_erc.cpp:215 -msgid "&Del Markers" -msgstr "&Supprimer Marqueurs" - -#: eeschema/dialog_erc.cpp:218 -msgid "&Quit" -msgstr "&Quitter" - -#: eeschema/dialog_erc.cpp:222 -msgid "erc" -msgstr "erc" - -#: eeschema/dialog_erc.cpp:228 -msgid "Reset" -msgstr "Défaut" - #: eeschema/erc.cpp:301 msgid "Annotation Required!" msgstr "Numérotation requise!" @@ -5747,6 +5723,82 @@ msgstr "Impossible de trouver le composant " msgid " in library" msgstr " en librairie" +#: eeschema/dialog_edit_label.cpp:68 +msgid "Global Label properties" +msgstr "Propriétés du Label Global" + +#: eeschema/dialog_edit_label.cpp:72 +msgid "Label properties" +msgstr "Propriétés du label" + +#: eeschema/dialog_edit_label.cpp:76 +msgid "Text properties" +msgstr "Propriétés du texte" + +#: eeschema/dialog_edit_label.cpp:132 +msgid "Text " +msgstr "Texte " + +#: eeschema/dialog_edit_label.cpp:142 +#: eeschema/affiche.cpp:111 +#: eeschema/pinedit-dialog.cpp:288 +msgid "Right" +msgstr "Droite" + +#: eeschema/dialog_edit_label.cpp:143 +#: eeschema/affiche.cpp:102 +#: eeschema/pinedit-dialog.cpp:290 +msgid "Up" +msgstr "Haut" + +#: eeschema/dialog_edit_label.cpp:144 +#: eeschema/affiche.cpp:108 +#: eeschema/pinedit-dialog.cpp:289 +msgid "Left" +msgstr "Gauche" + +#: eeschema/dialog_edit_label.cpp:145 +#: eeschema/affiche.cpp:105 +#: eeschema/pinedit-dialog.cpp:291 +msgid "Down" +msgstr "Bas" + +#: eeschema/dialog_edit_label.cpp:146 +msgid "Text Orient:" +msgstr "Orient:" + +#: eeschema/dialog_edit_label.cpp:153 +#: eeschema/pinedit-dialog.cpp:331 +msgid "Input" +msgstr "Entrée" + +#: eeschema/dialog_edit_label.cpp:154 +#: eeschema/pinedit-dialog.cpp:332 +msgid "Output" +msgstr "Sortie" + +#: eeschema/dialog_edit_label.cpp:155 +#: eeschema/pinedit-dialog.cpp:333 +msgid "Bidi" +msgstr "Bidi" + +#: eeschema/dialog_edit_label.cpp:156 +msgid "TriState" +msgstr "3 états" + +#: eeschema/dialog_edit_label.cpp:157 +#: eeschema/pinedit-dialog.cpp:335 +msgid "Passive" +msgstr "Passive" + +#: eeschema/dialog_edit_label.cpp:158 +msgid "Glabel Shape:" +msgstr "Forme GLabel:" + +#: eeschema/dialog_edit_label.cpp:166 +msgid "Size " +msgstr "Taille " + #: eeschema/plotps.cpp:179 msgid "Plot Options:" msgstr "Options de tracé:" @@ -5756,7 +5808,6 @@ msgid "B/W" msgstr "N/B" #: eeschema/plotps.cpp:185 -#: common/svg_print.cpp:190 #: share/dialog_print.cpp:183 #: share/svg_print.cpp:193 msgid "Color" @@ -5959,128 +6010,6 @@ msgstr "Voir documents des composants" msgid "Export to schematic" msgstr "Exportervers schematique" -#: eeschema/eestatus.cpp:150 -#: eeschema/dialog_eeschema_config.cpp:232 -msgid "Cmp file Ext: " -msgstr "Ext fichier Cmp: " - -#: eeschema/eestatus.cpp:154 -#: eeschema/dialog_eeschema_config.cpp:236 -msgid "Net file Ext: " -msgstr "Ext fichier Netliste: " - -#: eeschema/eestatus.cpp:158 -#: eeschema/dialog_eeschema_config.cpp:240 -msgid "Library file Ext: " -msgstr "Ext fichier Librairie: " - -#: eeschema/eestatus.cpp:162 -#: eeschema/dialog_eeschema_config.cpp:244 -msgid "Symbol file Ext: " -msgstr "Ext fichier Symbole: " - -#: eeschema/eestatus.cpp:166 -#: eeschema/dialog_eeschema_config.cpp:248 -msgid "Schematic file Ext: " -msgstr "Ext fichier Schema: " - -#: eeschema/eestatus.cpp:174 -#: eeschema/dialog_eeschema_config.cpp:219 -msgid "Library files path:" -msgstr "Chemin Fichiers Librairies:" - -#: eeschema/eestatus.cpp:249 -#: eeschema/dialog_eeschema_config.cpp:350 -msgid "Library files:" -msgstr "Fichiers Librairies:" - -#: eeschema/eestatus.cpp:272 -#: eeschema/dialog_eeschema_config.cpp:373 -msgid "Library already in use" -msgstr "Librairie déjà en usage" - -#: eeschema/eestatus.cpp:303 -#: eeschema/dialog_eeschema_config.cpp:174 -#: cvpcb/dialog_cvpcb_config.cpp:147 -msgid "NetList Formats:" -msgstr " Formats NetListe:" - -#: eeschema/dialog_edit_label.cpp:70 -msgid "Global Label properties" -msgstr "Propriétés du Label Global" - -#: eeschema/dialog_edit_label.cpp:74 -msgid "Label properties" -msgstr "Propriétés du label" - -#: eeschema/dialog_edit_label.cpp:78 -msgid "Text properties" -msgstr "Propriétés du texte" - -#: eeschema/dialog_edit_label.cpp:134 -msgid "Text " -msgstr "Texte " - -#: eeschema/dialog_edit_label.cpp:144 -#: eeschema/affiche.cpp:111 -#: eeschema/pinedit-dialog.cpp:288 -msgid "Right" -msgstr "Droite" - -#: eeschema/dialog_edit_label.cpp:145 -#: eeschema/affiche.cpp:102 -#: eeschema/pinedit-dialog.cpp:290 -msgid "Up" -msgstr "Haut" - -#: eeschema/dialog_edit_label.cpp:146 -#: eeschema/affiche.cpp:108 -#: eeschema/pinedit-dialog.cpp:289 -msgid "Left" -msgstr "Gauche" - -#: eeschema/dialog_edit_label.cpp:147 -#: eeschema/affiche.cpp:105 -#: eeschema/pinedit-dialog.cpp:291 -msgid "Down" -msgstr "Bas" - -#: eeschema/dialog_edit_label.cpp:149 -msgid "Text Orient:" -msgstr "Orient:" - -#: eeschema/dialog_edit_label.cpp:155 -#: eeschema/pinedit-dialog.cpp:331 -msgid "Input" -msgstr "Entrée" - -#: eeschema/dialog_edit_label.cpp:156 -#: eeschema/pinedit-dialog.cpp:332 -msgid "Output" -msgstr "Sortie" - -#: eeschema/dialog_edit_label.cpp:157 -#: eeschema/pinedit-dialog.cpp:333 -msgid "Bidi" -msgstr "Bidi" - -#: eeschema/dialog_edit_label.cpp:158 -msgid "TriState" -msgstr "3 états" - -#: eeschema/dialog_edit_label.cpp:159 -#: eeschema/pinedit-dialog.cpp:335 -msgid "Passive" -msgstr "Passive" - -#: eeschema/dialog_edit_label.cpp:161 -msgid "Glabel Shape:" -msgstr "Forme GLabel:" - -#: eeschema/dialog_edit_label.cpp:168 -msgid "Size " -msgstr "Taille " - #: eeschema/save_schemas.cpp:71 #: eeschema/eeload.cpp:59 #: eeschema/files-io.cpp:65 @@ -6199,7 +6128,6 @@ msgstr "Long." #: eeschema/affiche.cpp:169 #: eeschema/affiche.cpp:175 -#: common/svg_print.cpp:205 #: share/dialog_print.cpp:200 #: share/svg_print.cpp:211 msgid "All" @@ -6211,7 +6139,7 @@ msgid "Unit" msgstr "Unité" #: eeschema/affiche.cpp:182 -#: eeschema/dialog_edit_component_in_schematic.cpp:193 +#: eeschema/dialog_edit_component_in_schematic.cpp:190 #: eeschema/onrightclick.cpp:320 msgid "Convert" msgstr "Convert" @@ -6271,7 +6199,7 @@ msgstr "Symbole Alimentation" #: eeschema/dialog_edit_component_in_lib.cpp:162 #: eeschema/dialog_create_component.cpp:188 -#: eeschema/dialog_edit_component_in_schematic.cpp:190 +#: eeschema/dialog_edit_component_in_schematic.cpp:187 msgid "Parts are locked" msgstr "Les parts sont verrouillées" @@ -6469,163 +6397,47 @@ msgstr "&Spice" msgid "Other" msgstr "Autre" +#: eeschema/dialog_eeschema_config.cpp:174 +#: cvpcb/dialog_cvpcb_config.cpp:147 +msgid "NetList Formats:" +msgstr " Formats NetListe:" + +#: eeschema/dialog_eeschema_config.cpp:219 +msgid "Library files path:" +msgstr "Chemin Fichiers Librairies:" + +#: eeschema/dialog_eeschema_config.cpp:232 +msgid "Cmp file Ext: " +msgstr "Ext fichier Cmp: " + +#: eeschema/dialog_eeschema_config.cpp:236 +msgid "Net file Ext: " +msgstr "Ext fichier Netliste: " + +#: eeschema/dialog_eeschema_config.cpp:240 +msgid "Library file Ext: " +msgstr "Ext fichier Librairie: " + +#: eeschema/dialog_eeschema_config.cpp:244 +msgid "Symbol file Ext: " +msgstr "Ext fichier Symbole: " + +#: eeschema/dialog_eeschema_config.cpp:248 +msgid "Schematic file Ext: " +msgstr "Ext fichier Schema: " + +#: eeschema/dialog_eeschema_config.cpp:350 +msgid "Library files:" +msgstr "Fichiers Librairies:" + +#: eeschema/dialog_eeschema_config.cpp:373 +msgid "Library already in use" +msgstr "Librairie déjà en usage" + #: eeschema/dialog_eeschema_config.cpp:473 msgid " Default Path for libraries" msgstr "Chemin par défaut des librairies" -#: eeschema/dialog_edit_component_in_schematic.cpp:70 -msgid "Component properties (Not found in lib)" -msgstr "Propriétés du composant : non trouvé en librairie" - -#: eeschema/dialog_edit_component_in_schematic.cpp:135 -msgid "Unit 1" -msgstr "Unité 1" - -#: eeschema/dialog_edit_component_in_schematic.cpp:136 -msgid "Unit 2" -msgstr "Unité 2" - -#: eeschema/dialog_edit_component_in_schematic.cpp:137 -msgid "Unit 3" -msgstr "Unité 3" - -#: eeschema/dialog_edit_component_in_schematic.cpp:138 -msgid "Unit 4" -msgstr "Unité 4" - -#: eeschema/dialog_edit_component_in_schematic.cpp:139 -msgid "Unit 5" -msgstr "Unité 5" - -#: eeschema/dialog_edit_component_in_schematic.cpp:140 -msgid "Unit 6" -msgstr "Unité 6" - -#: eeschema/dialog_edit_component_in_schematic.cpp:141 -msgid "Unit 7" -msgstr "Unité 7" - -#: eeschema/dialog_edit_component_in_schematic.cpp:142 -msgid "Unit 8" -msgstr "Unité 8" - -#: eeschema/dialog_edit_component_in_schematic.cpp:143 -msgid "Unit 9" -msgstr "Unité 9" - -#: eeschema/dialog_edit_component_in_schematic.cpp:144 -msgid "Unit 10" -msgstr "Unité 10" - -#: eeschema/dialog_edit_component_in_schematic.cpp:145 -msgid "Unit 11" -msgstr "Unité 11" - -#: eeschema/dialog_edit_component_in_schematic.cpp:146 -msgid "Unit 12" -msgstr "Unité 12" - -#: eeschema/dialog_edit_component_in_schematic.cpp:147 -msgid "Unit 13" -msgstr "Unité 13" - -#: eeschema/dialog_edit_component_in_schematic.cpp:148 -msgid "Unit 14" -msgstr "Unité 14" - -#: eeschema/dialog_edit_component_in_schematic.cpp:149 -msgid "Unit 15" -msgstr "Unité 15" - -#: eeschema/dialog_edit_component_in_schematic.cpp:150 -#: eeschema/dialog_edit_component_in_schematic.cpp:151 -msgid "Unit 16" -msgstr "Unité 16" - -#: eeschema/dialog_edit_component_in_schematic.cpp:152 -msgid "Unit 17" -msgstr "Unité 17" - -#: eeschema/dialog_edit_component_in_schematic.cpp:153 -msgid "Unit 18" -msgstr "Unité 18" - -#: eeschema/dialog_edit_component_in_schematic.cpp:154 -msgid "Unit 19" -msgstr "Unité 19" - -#: eeschema/dialog_edit_component_in_schematic.cpp:155 -msgid "Unit 20" -msgstr "Unité 20" - -#: eeschema/dialog_edit_component_in_schematic.cpp:156 -msgid "Unit 21" -msgstr "Unité 21" - -#: eeschema/dialog_edit_component_in_schematic.cpp:157 -msgid "Unit 22" -msgstr "Unité 22" - -#: eeschema/dialog_edit_component_in_schematic.cpp:158 -msgid "Unit 23" -msgstr "Unité 23" - -#: eeschema/dialog_edit_component_in_schematic.cpp:159 -msgid "Unit 24" -msgstr "Unité 24" - -#: eeschema/dialog_edit_component_in_schematic.cpp:160 -msgid "Unit 25" -msgstr "Unité 25" - -#: eeschema/dialog_edit_component_in_schematic.cpp:161 -msgid "Unit 26" -msgstr "Unité 26" - -#: eeschema/dialog_edit_component_in_schematic.cpp:163 -msgid "Unit:" -msgstr "Unité:" - -#: eeschema/dialog_edit_component_in_schematic.cpp:173 -msgid "+90" -msgstr "+90" - -#: eeschema/dialog_edit_component_in_schematic.cpp:177 -msgid "Orient:" -msgstr "Orient:" - -#: eeschema/dialog_edit_component_in_schematic.cpp:183 -#: eeschema/onrightclick.cpp:301 -msgid "Mirror --" -msgstr "Miroir--" - -#: eeschema/dialog_edit_component_in_schematic.cpp:184 -msgid "Mirror !" -msgstr "Miroir |" - -#: eeschema/dialog_edit_component_in_schematic.cpp:186 -msgid "Mirror:" -msgstr "Miroir:" - -#: eeschema/dialog_edit_component_in_schematic.cpp:197 -msgid "Chip Name:" -msgstr "Nom en librairie" - -#: eeschema/dialog_edit_component_in_schematic.cpp:214 -#: eeschema/edit_component_in_lib.cpp:497 -msgid "Show Text" -msgstr "Texte visible" - -#: eeschema/dialog_edit_component_in_schematic.cpp:228 -#: eeschema/edit_component_in_lib.cpp:484 -#: eeschema/eelayer.h:164 -msgid "Fields" -msgstr "Champs" - -#: eeschema/dialog_edit_component_in_schematic.cpp:239 -msgid "Defaults" -msgstr "Defauts" - #: eeschema/database.cpp:70 msgid "No Component found" msgstr "Pas de composants trouvés" @@ -6647,74 +6459,6 @@ msgstr "S msgid "Select component (%d items)" msgstr "Selection composant (%d items)" -#: eeschema/dialog_find.cpp:119 -msgid "Item in &Sheet" -msgstr "Item dans &feuille" - -#: eeschema/dialog_find.cpp:122 -msgid "Item in &Hierarchy" -msgstr "Item dans &Hiérarchie" - -#: eeschema/dialog_find.cpp:125 -msgid "Find &Next Item (F5)" -msgstr "Item &Suivant (F5)" - -#: eeschema/dialog_find.cpp:131 -msgid "Find Markers" -msgstr "Chercher Marqueurs" - -#: eeschema/dialog_find.cpp:135 -msgid "Next Marker (F5)" -msgstr "Marqueur Suivant (F5)" - -#: eeschema/dialog_find.cpp:139 -msgid "Find Cmp in &Lib" -msgstr "Cmp. en &Libr." - -#: eeschema/eeconfig.cpp:70 -#: kicad/files-io.cpp:131 -#: gerbview/dcode.cpp:260 -#: gerbview/readgerb.cpp:145 -msgid "File " -msgstr "Fichier " - -#: eeschema/eeconfig.cpp:70 -msgid "not found" -msgstr " non trouvé" - -#: eeschema/schframe.cpp:182 -msgid "Schematic modified, Save before exit ?" -msgstr "Schematique modifiée, Sauver avant de quitter ?" - -#: eeschema/schframe.cpp:284 -msgid "No show Hidden Pins" -msgstr "N'affichage pas les pins invisibles" - -#: eeschema/schframe.cpp:284 -#: eeschema/tool_sch.cpp:274 -msgid "Show Hidden Pins" -msgstr "Force affichage des pins invisibles" - -#: eeschema/schframe.cpp:287 -msgid "Draw lines at any direction" -msgstr "Tracer traits de direction quelconque" - -#: eeschema/schframe.cpp:288 -msgid "Draw lines H, V or 45 deg only" -msgstr "Tracer traits H, V ou 45 deg seulement" - -#: eeschema/dialog_cmp_graphic_properties.cpp:167 -msgid "Void" -msgstr "Sans" - -#: eeschema/dialog_cmp_graphic_properties.cpp:169 -msgid "BgFilled" -msgstr "Fond Plein" - -#: eeschema/dialog_cmp_graphic_properties.cpp:171 -msgid "Fill:" -msgstr "Remplissage:" - #: eeschema/netlist_control.cpp:97 #: eeschema/netlist_control.cpp:244 #: gerbview/options.cpp:201 @@ -6785,6 +6529,74 @@ msgstr "Fichiers Netlist:" msgid "Must be Annotated, Continue ?" msgstr "Annotation nécessaire, continuer?" +#: eeschema/dialog_find.cpp:119 +msgid "Item in &Sheet" +msgstr "Item dans &feuille" + +#: eeschema/dialog_find.cpp:122 +msgid "Item in &Hierarchy" +msgstr "Item dans &Hiérarchie" + +#: eeschema/dialog_find.cpp:125 +msgid "Find &Next Item (F5)" +msgstr "Item &Suivant (F5)" + +#: eeschema/dialog_find.cpp:131 +msgid "Find Markers" +msgstr "Chercher Marqueurs" + +#: eeschema/dialog_find.cpp:135 +msgid "Next Marker (F5)" +msgstr "Marqueur Suivant (F5)" + +#: eeschema/dialog_find.cpp:139 +msgid "Find Cmp in &Lib" +msgstr "Cmp. en &Libr." + +#: eeschema/eeconfig.cpp:70 +#: kicad/files-io.cpp:131 +#: gerbview/dcode.cpp:260 +#: gerbview/readgerb.cpp:145 +msgid "File " +msgstr "Fichier " + +#: eeschema/eeconfig.cpp:70 +msgid "not found" +msgstr " non trouvé" + +#: eeschema/schframe.cpp:182 +msgid "Schematic modified, Save before exit ?" +msgstr "Schematique modifiée, Sauver avant de quitter ?" + +#: eeschema/schframe.cpp:284 +msgid "No show Hidden Pins" +msgstr "N'affichage pas les pins invisibles" + +#: eeschema/schframe.cpp:284 +#: eeschema/tool_sch.cpp:274 +msgid "Show Hidden Pins" +msgstr "Force affichage des pins invisibles" + +#: eeschema/schframe.cpp:287 +msgid "Draw lines at any direction" +msgstr "Tracer traits de direction quelconque" + +#: eeschema/schframe.cpp:288 +msgid "Draw lines H, V or 45 deg only" +msgstr "Tracer traits H, V ou 45 deg seulement" + +#: eeschema/dialog_cmp_graphic_properties.cpp:167 +msgid "Void" +msgstr "Sans" + +#: eeschema/dialog_cmp_graphic_properties.cpp:169 +msgid "BgFilled" +msgstr "Fond Plein" + +#: eeschema/dialog_cmp_graphic_properties.cpp:171 +msgid "Fill:" +msgstr "Remplissage:" + #: eeschema/dialog_build_BOM.cpp:246 msgid "List items:" msgstr " Liste éléments: " @@ -6965,6 +6777,51 @@ msgstr "> %-28.28s Sheet %-7.7s (feuille %.2d) pos: %3.3f, %3.3f\n" msgid "#End labels\n" msgstr "#End labels\n" +#: eeschema/edit_label.cpp:49 +msgid "Empty Text!" +msgstr "Texte vide" + +#: eeschema/dialog_erc.cpp:171 +#: eeschema/dialog_erc.cpp:202 +msgid "Erc File Report:" +msgstr "Fichier rapport d'erreurs:" + +#: eeschema/dialog_erc.cpp:176 +msgid "-> Total Errors: " +msgstr "-> Total Erreurs: " + +#: eeschema/dialog_erc.cpp:179 +msgid "-> Last Warnings: " +msgstr "-> Dern. Warnings: " + +#: eeschema/dialog_erc.cpp:183 +msgid "-> Last Errors: " +msgstr "-> Dern. Erreurs: " + +#: eeschema/dialog_erc.cpp:189 +msgid "0000" +msgstr "0000" + +#: eeschema/dialog_erc.cpp:205 +msgid "Write erc report" +msgstr "Rapport d'erreur" + +#: eeschema/dialog_erc.cpp:211 +msgid "&Test Erc" +msgstr "&Test Erc" + +#: eeschema/dialog_erc.cpp:215 +msgid "&Del Markers" +msgstr "&Supprimer Marqueurs" + +#: eeschema/dialog_erc.cpp:222 +msgid "erc" +msgstr "erc" + +#: eeschema/dialog_erc.cpp:228 +msgid "Reset" +msgstr "Défaut" + #: eeschema/files-io.cpp:57 msgid "Clear SubHierarchy ?" msgstr "Supprimer la sous hiérarchie?" @@ -6994,6 +6851,207 @@ msgstr "Librairie <" msgid "> header read error" msgstr "> erreur lecture entête" +#: eeschema/edit_component_in_schematic.cpp:195 +#: eeschema/edit_component_in_lib.cpp:554 +msgid "Field to edit" +msgstr "Champ à éditer" + +#: eeschema/edit_component_in_schematic.cpp:201 +#: eeschema/edit_component_in_lib.cpp:508 +msgid "Field Name:" +msgstr "Nom Champ" + +#: eeschema/edit_component_in_schematic.cpp:219 +#: eeschema/edit_component_in_lib.cpp:524 +msgid "Pos" +msgstr "Pos" + +#: eeschema/edit_component_in_schematic.cpp:326 +msgid "No Component Name!" +msgstr "Pas de nom de composant!" + +#: eeschema/edit_component_in_schematic.cpp:332 +#, c-format +msgid "Component [%s] not found!" +msgstr "Composant [%s] non trouvé!" + +#: eeschema/edit_component_in_schematic.cpp:449 +msgid "No Field to move" +msgstr "Pas de champ a déplacer" + +#: eeschema/edit_component_in_schematic.cpp:512 +msgid "No Field To Edit" +msgstr "Pas de champ a éditer" + +#: eeschema/edit_component_in_schematic.cpp:526 +msgid "" +"Part is a POWER, value cannot be modified!\n" +"You must create a new power" +msgstr "" +"Composant type ALIMENTATION!\n" +"valeur non modifiable, Vous devez créer un nouveau composant alimentation " + +#: eeschema/edit_component_in_schematic.cpp:569 +msgid "Reference needed !, No change" +msgstr "Référence NECESSAIRE: changement refusé" + +#: eeschema/edit_component_in_schematic.cpp:573 +msgid "Value needed !, No change" +msgstr "Valeur NECESSAIRE: changement refusé" + +#: eeschema/dialog_edit_component_in_schematic.cpp:70 +msgid "Component properties (Not found in lib)" +msgstr "Propriétés du composant : non trouvé en librairie" + +#: eeschema/dialog_edit_component_in_schematic.cpp:135 +msgid "Unit 1" +msgstr "Unité 1" + +#: eeschema/dialog_edit_component_in_schematic.cpp:136 +msgid "Unit 2" +msgstr "Unité 2" + +#: eeschema/dialog_edit_component_in_schematic.cpp:137 +msgid "Unit 3" +msgstr "Unité 3" + +#: eeschema/dialog_edit_component_in_schematic.cpp:138 +msgid "Unit 4" +msgstr "Unité 4" + +#: eeschema/dialog_edit_component_in_schematic.cpp:139 +msgid "Unit 5" +msgstr "Unité 5" + +#: eeschema/dialog_edit_component_in_schematic.cpp:140 +msgid "Unit 6" +msgstr "Unité 6" + +#: eeschema/dialog_edit_component_in_schematic.cpp:141 +msgid "Unit 7" +msgstr "Unité 7" + +#: eeschema/dialog_edit_component_in_schematic.cpp:142 +msgid "Unit 8" +msgstr "Unité 8" + +#: eeschema/dialog_edit_component_in_schematic.cpp:143 +msgid "Unit 9" +msgstr "Unité 9" + +#: eeschema/dialog_edit_component_in_schematic.cpp:144 +msgid "Unit 10" +msgstr "Unité 10" + +#: eeschema/dialog_edit_component_in_schematic.cpp:145 +msgid "Unit 11" +msgstr "Unité 11" + +#: eeschema/dialog_edit_component_in_schematic.cpp:146 +msgid "Unit 12" +msgstr "Unité 12" + +#: eeschema/dialog_edit_component_in_schematic.cpp:147 +msgid "Unit 13" +msgstr "Unité 13" + +#: eeschema/dialog_edit_component_in_schematic.cpp:148 +msgid "Unit 14" +msgstr "Unité 14" + +#: eeschema/dialog_edit_component_in_schematic.cpp:149 +msgid "Unit 15" +msgstr "Unité 15" + +#: eeschema/dialog_edit_component_in_schematic.cpp:150 +#: eeschema/dialog_edit_component_in_schematic.cpp:151 +msgid "Unit 16" +msgstr "Unité 16" + +#: eeschema/dialog_edit_component_in_schematic.cpp:152 +msgid "Unit 17" +msgstr "Unité 17" + +#: eeschema/dialog_edit_component_in_schematic.cpp:153 +msgid "Unit 18" +msgstr "Unité 18" + +#: eeschema/dialog_edit_component_in_schematic.cpp:154 +msgid "Unit 19" +msgstr "Unité 19" + +#: eeschema/dialog_edit_component_in_schematic.cpp:155 +msgid "Unit 20" +msgstr "Unité 20" + +#: eeschema/dialog_edit_component_in_schematic.cpp:156 +msgid "Unit 21" +msgstr "Unité 21" + +#: eeschema/dialog_edit_component_in_schematic.cpp:157 +msgid "Unit 22" +msgstr "Unité 22" + +#: eeschema/dialog_edit_component_in_schematic.cpp:158 +msgid "Unit 23" +msgstr "Unité 23" + +#: eeschema/dialog_edit_component_in_schematic.cpp:159 +msgid "Unit 24" +msgstr "Unité 24" + +#: eeschema/dialog_edit_component_in_schematic.cpp:160 +msgid "Unit 25" +msgstr "Unité 25" + +#: eeschema/dialog_edit_component_in_schematic.cpp:161 +msgid "Unit 26" +msgstr "Unité 26" + +#: eeschema/dialog_edit_component_in_schematic.cpp:162 +msgid "Unit:" +msgstr "Unité:" + +#: eeschema/dialog_edit_component_in_schematic.cpp:172 +msgid "+90" +msgstr "+90" + +#: eeschema/dialog_edit_component_in_schematic.cpp:175 +msgid "Orient:" +msgstr "Orient:" + +#: eeschema/dialog_edit_component_in_schematic.cpp:181 +#: eeschema/onrightclick.cpp:301 +msgid "Mirror --" +msgstr "Miroir--" + +#: eeschema/dialog_edit_component_in_schematic.cpp:182 +msgid "Mirror !" +msgstr "Miroir |" + +#: eeschema/dialog_edit_component_in_schematic.cpp:183 +msgid "Mirror:" +msgstr "Miroir:" + +#: eeschema/dialog_edit_component_in_schematic.cpp:194 +msgid "Chip Name:" +msgstr "Nom en librairie" + +#: eeschema/dialog_edit_component_in_schematic.cpp:211 +#: eeschema/edit_component_in_lib.cpp:497 +msgid "Show Text" +msgstr "Texte visible" + +#: eeschema/dialog_edit_component_in_schematic.cpp:225 +#: eeschema/edit_component_in_lib.cpp:484 +#: eeschema/eelayer.h:164 +msgid "Fields" +msgstr "Champs" + +#: eeschema/dialog_edit_component_in_schematic.cpp:236 +msgid "Defaults" +msgstr "Defauts" + #: eeschema/tool_sch.cpp:55 msgid "New schematic project" msgstr "Nouveau Projet schématique" @@ -7605,10 +7663,6 @@ msgstr "Miroir Bloc ||" msgid "Copy to Clipboard" msgstr "Copie dans Presse papier" -#: eeschema/edit_label.cpp:49 -msgid "Empty Text!" -msgstr "Texte vide" - #: eeschema/edit_component_in_lib.cpp:168 #: eeschema/dialog_edit_component_in_lib.h:43 msgid "Lib Component Properties" @@ -7657,20 +7711,10 @@ msgstr "Justifi msgid "Top justify" msgstr "Justifié en haut" -#: eeschema/edit_component_in_lib.cpp:508 -#: eeschema/edit_component_in_schematic.cpp:201 -msgid "Field Name:" -msgstr "Nom Champ" - #: eeschema/edit_component_in_lib.cpp:518 msgid "Value/Chip Name:" msgstr "Valeur/Nom en librairie" -#: eeschema/edit_component_in_lib.cpp:524 -#: eeschema/edit_component_in_schematic.cpp:219 -msgid "Pos" -msgstr "Pos" - #: eeschema/edit_component_in_lib.cpp:529 msgid "Hor Justify" msgstr "Justifié horiz" @@ -7683,11 +7727,6 @@ msgstr "Justifi msgid "Chip Name" msgstr "Nom en librairie" -#: eeschema/edit_component_in_lib.cpp:554 -#: eeschema/edit_component_in_schematic.cpp:195 -msgid "Field to edit" -msgstr "Champ à éditer" - #: eeschema/edit_component_in_lib.cpp:890 msgid "Ok to Delete Alias LIST" msgstr "Ok pour effacer la LISTE des Alias" @@ -7751,83 +7790,6 @@ msgstr "Chargement " msgid " is NOT EESchema file" msgstr " n'est PAS un fichier EESchema" -#: eeschema/edit_component_in_schematic.cpp:326 -msgid "No Component Name!" -msgstr "Pas de nom de composant!" - -#: eeschema/edit_component_in_schematic.cpp:332 -#, c-format -msgid "Component [%s] not found!" -msgstr "Composant [%s] non trouvé!" - -#: eeschema/edit_component_in_schematic.cpp:449 -msgid "No Field to move" -msgstr "Pas de champ a déplacer" - -#: eeschema/edit_component_in_schematic.cpp:512 -msgid "No Field To Edit" -msgstr "Pas de champ a éditer" - -#: eeschema/edit_component_in_schematic.cpp:526 -msgid "" -"Part is a POWER, value cannot be modified!\n" -"You must create a new power" -msgstr "" -"Composant type ALIMENTATION!\n" -"valeur non modifiable, Vous devez créer un nouveau composant alimentation " - -#: eeschema/edit_component_in_schematic.cpp:569 -msgid "Reference needed !, No change" -msgstr "Référence NECESSAIRE: changement refusé" - -#: eeschema/edit_component_in_schematic.cpp:573 -msgid "Value needed !, No change" -msgstr "Valeur NECESSAIRE: changement refusé" - -#: 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/autosel.cpp:68 #, c-format msgid "Library: <%s> not found" @@ -9071,54 +9033,6 @@ msgstr "Catalan" msgid "Language" msgstr "Langage" -#: common/svg_print.cpp:183 -#: share/dialog_print.cpp:236 -#: share/svg_print.cpp:243 -msgid "Pen width mini" -msgstr "Epaiss plume mini" - -#: common/svg_print.cpp:191 -#: share/svg_print.cpp:194 -msgid "Black and White" -msgstr "Noir et Blanc" - -#: common/svg_print.cpp:193 -#: share/svg_print.cpp:196 -msgid "Print mode" -msgstr "Mode d'impression" - -#: common/svg_print.cpp:204 -#: share/dialog_print.cpp:199 -#: share/svg_print.cpp:210 -msgid "Current" -msgstr "Courant" - -#: common/svg_print.cpp:207 -#: share/dialog_print.cpp:194 -#: share/dialog_print.cpp:202 -#: share/svg_print.cpp:213 -msgid "Page Print:" -msgstr "Imprimer page" - -#: common/svg_print.cpp:216 -#: share/svg_print.cpp:217 -msgid "Create &File" -msgstr "Créer &Fichier" - -#: common/svg_print.cpp:364 -#: common/svg_print.cpp:377 -#: share/svg_print.cpp:363 -#: share/svg_print.cpp:377 -msgid "Create file " -msgstr "Créer Fichier " - -#: common/svg_print.cpp:365 -#: common/svg_print.cpp:378 -#: share/svg_print.cpp:364 -#: share/svg_print.cpp:378 -msgid " error" -msgstr " erreur" - #: common/eda_doc.cpp:144 msgid "Doc File " msgstr "Fichiers de Doc " @@ -9484,6 +9398,17 @@ msgstr "1 page par couche" msgid "Single Page" msgstr "Page unique" +#: share/dialog_print.cpp:194 +#: share/dialog_print.cpp:202 +#: share/svg_print.cpp:213 +msgid "Page Print:" +msgstr "Imprimer page" + +#: share/dialog_print.cpp:199 +#: share/svg_print.cpp:210 +msgid "Current" +msgstr "Courant" + #: share/dialog_print.cpp:213 msgid "Print S&etup" msgstr "Options Impr&ession" @@ -9496,6 +9421,11 @@ msgstr "Pre&visualisation" msgid "&Print" msgstr "Imp&rimer" +#: share/dialog_print.cpp:236 +#: share/svg_print.cpp:243 +msgid "Pen width mini" +msgstr "Epaiss plume mini" + #: share/zoom.cpp:322 msgid "Zoom: " msgstr "Zoom: " @@ -9541,6 +9471,28 @@ msgstr "Il y a un probl msgid "Print page %d" msgstr "Print page %d" +#: share/svg_print.cpp:194 +msgid "Black and White" +msgstr "Noir et Blanc" + +#: share/svg_print.cpp:196 +msgid "Print mode" +msgstr "Mode d'impression" + +#: share/svg_print.cpp:217 +msgid "Create &File" +msgstr "Créer &Fichier" + +#: share/svg_print.cpp:363 +#: share/svg_print.cpp:377 +msgid "Create file " +msgstr "Créer Fichier " + +#: share/svg_print.cpp:364 +#: share/svg_print.cpp:378 +msgid " error" +msgstr " erreur" + #: share/setpage.cpp:198 msgid "Size A4" msgstr "Format A4 " @@ -9641,48 +9593,6 @@ msgstr "Commentaire4:" msgid "Export to other sheets" msgstr "Exporter vers autres feuilles" -#: share/infospgm.cpp:48 -msgid "Build Version:" -msgstr "Build Version:" - -#: share/infospgm.cpp:63 -msgid "Author:" -msgstr "Autheur:" - -#: share/infospgm.cpp:64 -msgid "Based on wxWidgets " -msgstr "Based on wxWidgets " - -#: share/infospgm.cpp:69 -msgid "" -"\n" -"\n" -"GPL License" -msgstr "" -"\n" -"\n" -"GPL Licence" - -#: share/infospgm.cpp:70 -msgid "" -"\n" -"\n" -"Author's sites:\n" -msgstr "" -"\n" -"\n" -"Sites Web de l'auteur:\n" - -#: share/infospgm.cpp:73 -msgid "" -"\n" -"\n" -"International wiki:\n" -msgstr "" -"\n" -"\n" -"International wiki:\n" - #: share/drawframe.cpp:136 msgid "font for info display" msgstr "fonte pour affichage infos" @@ -9695,6 +9605,48 @@ msgstr "Pouce" msgid "??" msgstr "??" +#: share/infospgm.cpp:47 +msgid "Build Version:" +msgstr "Build Version:" + +#: share/infospgm.cpp:62 +msgid "Author:" +msgstr "Autheur:" + +#: share/infospgm.cpp:63 +msgid "Based on wxWidgets " +msgstr "Based on wxWidgets " + +#: share/infospgm.cpp:68 +msgid "" +"\n" +"\n" +"GPL License" +msgstr "" +"\n" +"\n" +"GPL Licence" + +#: share/infospgm.cpp:69 +msgid "" +"\n" +"\n" +"Author's sites:\n" +msgstr "" +"\n" +"\n" +"Sites Web de l'auteur:\n" + +#: share/infospgm.cpp:72 +msgid "" +"\n" +"\n" +"International wiki:\n" +msgstr "" +"\n" +"\n" +"International wiki:\n" + #: pcbnew/gen_self.h:217 msgid "Length(inch):" msgstr "Longueur (pouces):" @@ -9721,8 +9673,8 @@ msgid "Find" msgstr "Chercher" #: pcbnew/dialog_setup_libs.h:43 -#: eeschema/dialog_edit_label.h:40 #: eeschema/dialog_eeschema_config.h:50 +#: eeschema/dialog_edit_label.h:44 msgid "Dialog" msgstr "Dialog" @@ -9755,51 +9707,55 @@ msgstr "Options de remplissage de Zone" msgid "Global Delete" msgstr "Effacements Généraux" -#: pcbnew/set_color.h:5 +#: pcbnew/set_color.h:38 +msgid "Pcbnew Layer Colors:" +msgstr "Pcbnew: Couleur desCouches" + +#: pcbnew/set_color.h:81 msgid "Copper Layers" msgstr "Couches Cuivre." -#: pcbnew/set_color.h:139 +#: pcbnew/set_color.h:216 msgid "Tech Layers" msgstr "Couches Tech." -#: pcbnew/set_color.h:278 +#: pcbnew/set_color.h:357 msgid "Ratsnest" msgstr "Chevelu" -#: pcbnew/set_color.h:287 +#: pcbnew/set_color.h:366 msgid "Pad Cu" msgstr "Pad Cu" -#: pcbnew/set_color.h:295 +#: pcbnew/set_color.h:374 msgid "Pad Cmp" msgstr "Pad Cmp" -#: pcbnew/set_color.h:303 +#: pcbnew/set_color.h:382 msgid "Text Module Cu" msgstr "Texte Module Cu" -#: pcbnew/set_color.h:311 +#: pcbnew/set_color.h:390 msgid "Text Module Cmp" msgstr "Texte Module Cmp" -#: pcbnew/set_color.h:319 +#: pcbnew/set_color.h:398 msgid "Text Module invisible" msgstr "Texte Module invisible" -#: pcbnew/set_color.h:327 +#: pcbnew/set_color.h:406 msgid "Anchors" msgstr "Ancres" -#: pcbnew/set_color.h:353 +#: pcbnew/set_color.h:432 msgid "Show Noconnect" msgstr "Montrer Non Conn" -#: pcbnew/set_color.h:362 +#: pcbnew/set_color.h:441 msgid "Show Modules Cmp" msgstr "Afficher Modules Cmp" -#: pcbnew/set_color.h:371 +#: pcbnew/set_color.h:450 msgid "Show Modules Cu" msgstr "Afficher Modules Cu" @@ -9823,18 +9779,18 @@ msgstr "EESchema Trac msgid "Pin properties" msgstr "Propriétés des Pins" -#: eeschema/dialog_erc.h:59 +#: eeschema/dialog_erc.h:57 msgid "EESchema Erc" msgstr "EESchema Erc" -#: eeschema/annotate_dialog.h:53 -msgid "EESchema Annotation" -msgstr "Numérotation des composants" - #: eeschema/dialog_find.h:39 msgid "EESchema Locate" msgstr "Recherche" +#: eeschema/annotate_dialog.h:53 +msgid "EESchema Annotation" +msgstr "Numérotation des composants" + #: eeschema/dialog_build_BOM.h:61 msgid "List of Material" msgstr "Liste du Matériel" @@ -9919,6 +9875,10 @@ msgstr "Feuilles" msgid "Erc Mark" msgstr "Marqueur ERC" +#: eeschema/dialog_edit_component_in_schematic.h:52 +msgid "Component properties" +msgstr "Propriétés du composant" + #: eeschema/sheet.h:43 msgid "Sheet properties" msgstr "Propriétés de la feuille" @@ -9935,10 +9895,6 @@ msgstr "Creation Composant:" msgid "Graphic shape properties" msgstr "Propriétés du dessin" -#: eeschema/dialog_edit_component_in_schematic.h:52 -msgid "Component properties" -msgstr "Propriétés du composant" - #: cvpcb/dialog_cvpcb_config.h:50 msgid "Cvpcb Configuration" msgstr "Configuration de Cvpcb" @@ -10087,15 +10043,14 @@ msgstr "Autres" msgid "D codes id." msgstr "DCodes id." -#: common/svg_print.h:52 -#: share/svg_print.h:50 -msgid "Create SVG file" -msgstr "Créer Fichier SVG" - #: share/setpage.h:54 msgid "Page Settings" msgstr "Ajustage opt Page" +#: share/svg_print.h:50 +msgid "Create SVG file" +msgstr "Créer Fichier SVG" + #: share/dialog_print.h:51 msgid "Print" msgstr "Imprimer" diff --git a/libs.linux b/libs.linux index 5b6d1251c6..2eedc209a8 100644 --- a/libs.linux +++ b/libs.linux @@ -2,16 +2,36 @@ # Configuration for kicad build & install # +# You must comment or uncomment this line to disable/enable python support +#KICAD_PYTHON = 1 + # Locations for install targets. All can be overriden on the make command. # Normally you'd only expect to override the PREFIX if you want to install to # a non standard install dir (or a temp location for packaging). # For packaging you can override and install anywhere, but to run from a # non-standard location edit common/gestfich.ccp so it knows where to # load help/data/etc. files from. -# Current supported PREFIXes are /usr, /usr/local & /usr/local/kicad +# Current supported PREFIXes are /usr and /usr/local (standard install for distributions) +# and /usr/local/kicad is used when STD_INSTALL = 0 or STD_INSTALL = 2 +# all kicad files will be in /usr/local/kicad +# STD_INSTALL = 2 is used only to make static link (only useful when kicad run on an other +# linux distribution than the distributions used to compil kicad. STD_INSTALL = 1 +#******************************************* +#******************************************* + +ifndef KICAD_PYTHON +ifeq ($(STD_INSTALL), 2) +KICAD_STATIC_LINK = 1 +endif +endif + +ifndef KICAD_STATIC_LINK +KICAD_STATIC_LINK = 0 +endif + ifeq ($(STD_INSTALL), 1) PREFIX = /usr KICAD_BIN = $(PREFIX)/bin @@ -24,7 +44,8 @@ KICAD_INTERNAT=$(KICAD_DATA)/internat KICAD_TEMPLATE=$(KICAD_DATA)/template else -# used by myself (JP Charras) to build a statically linked distribution intalled in /usr/local (with STD_INSTALL = 0) +# when STD_INSTALL = 0 or STD_INSTALL = 2 +# STD_INSTALL = 2 is used by myself (JP Charras) to build a statically linked distribution intalled in /usr/local (with STD_INSTALL = 0) PREFIX = /usr/local/kicad KICAD_BIN = $(PREFIX)/linux KICAD_PLUGINS = $(KICAD_BIN)/plugins @@ -68,17 +89,6 @@ CPPFLAGS += -DUSE_MATCH_LAYER endif -# You must comment or uncomment this line to disable/enable python support -#KICAD_PYTHON = 1 - -# 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 -ifeq ($(STD_INSTALL), 0) -KICAD_STATIC_LINK = 1 -endif -endif ifeq ($(KICAD_STATIC_LINK), 1) LD = gcc diff --git a/pcbnew/reglage.cpp.notused b/pcbnew/reglage.cpp.notused deleted file mode 100644 index 121ec8b158..0000000000 --- a/pcbnew/reglage.cpp.notused +++ /dev/null @@ -1,281 +0,0 @@ - /********************************************/ - /* PCBNEW - Gestion des Options et Reglages */ - /********************************************/ - - /* Fichier reglage.cpp */ - -/* - Affichage et modifications des parametres de travail de PcbNew - Parametres = dimensions des via, pistes, isolements, options... -*/ - - -#include "fctsys.h" -#include "gr_basic.h" - -#include "common.h" -#include "pcbnew.h" -#include "pcbplot.h" - -#include "protos.h" - -enum { - SAVE_CFG = 1000, - DEL_LIB, - ADD_LIB, - INSERT_LIB, - FORMAT_NETLIST - }; - -/* Routines Locales */ - - /*************************************************/ - /* classe derivee pour la frame de Configuration */ - /*************************************************/ - -class WinEDA_ConfigFrame: public wxDialog -{ -public: - - WinEDA_PcbFrame * m_Parent; - wxListBox * ListLibr; - int LibModified; - - WinEDA_EnterText * m_TextLibDir; - WinEDA_EnterText * m_TextHelpModulesFileName; - -public: - // Constructor and destructor - WinEDA_ConfigFrame(WinEDA_PcbFrame *parent,const wxPoint& pos); - ~WinEDA_ConfigFrame() {}; - -private: - void OnCloseWindow(wxCloseEvent & event); - void SaveCfg(wxCommandEvent& event); - void LibDelFct(wxCommandEvent& event); - void LibInsertFct(wxCommandEvent& event); - void SetNewOptions(); - - DECLARE_EVENT_TABLE() - -}; -/* Construction de la table des evenements pour WinEDA_ConfigFrame */ -BEGIN_EVENT_TABLE(WinEDA_ConfigFrame, wxDialog) - EVT_BUTTON(SAVE_CFG, WinEDA_ConfigFrame::SaveCfg) - EVT_BUTTON(DEL_LIB, WinEDA_ConfigFrame::LibDelFct) - EVT_BUTTON(ADD_LIB, WinEDA_ConfigFrame::LibInsertFct) - EVT_BUTTON(INSERT_LIB, WinEDA_ConfigFrame::LibInsertFct) - EVT_CLOSE(WinEDA_ConfigFrame::OnCloseWindow) -END_EVENT_TABLE() - - - -/*****************************************************************/ -void WinEDA_PcbFrame::InstallConfigFrame(const wxPoint & pos) -/*****************************************************************/ -{ -WinEDA_ConfigFrame * CfgFrame = new WinEDA_ConfigFrame(this, pos); - CfgFrame->ShowModal(); CfgFrame->Destroy(); -} - - - /************************************************************/ - /* Constructeur de WinEDA_ConfigFrame: la fenetre de config */ - /************************************************************/ - -#define X_SIZE 450 -#define Y_SIZE 380 -WinEDA_ConfigFrame::WinEDA_ConfigFrame(WinEDA_PcbFrame *parent, - const wxPoint& framepos): - wxDialog(parent, -1, "", framepos, wxSize(X_SIZE, Y_SIZE), - DIALOG_STYLE ) -{ -wxPoint pos; -wxSize size; -wxString title; -wxButton * Button; - - m_Parent = parent; - SetFont(*g_DialogFont); - - title = _("from ") + EDA_Appl->m_CurrentOptionFile; - SetTitle(title); - - LibModified = FALSE; - - /* Creation des boutons de commande */ - pos.x = 10; pos.y = 5; - Button = new wxButton(this, SAVE_CFG, _("Save Cfg"), pos); - Button->SetForegroundColour(*wxRED); - - pos.x = 190; - Button = new wxButton(this, DEL_LIB, _("Del"), pos); - Button->SetForegroundColour(*wxRED); - - pos.x += Button->GetSize().x; - Button = new wxButton(this, ADD_LIB, _("Add"), pos ); - Button->SetForegroundColour(wxColor(0,80,0)); - - pos.x += Button->GetSize().x; - Button = new wxButton(this, INSERT_LIB, _("Ins"), pos ); - Button->SetForegroundColour(*wxBLUE); - - pos.x = 190; pos.y += 35; - wxStaticText * Msg = new wxStaticText(this, -1, _("Lib Modules:"), pos ); - pos.y += 15; - ListLibr = new wxListBox(this, - -1, - pos, wxSize(X_SIZE - pos.x -10,190), - 0,NULL, - wxLB_ALWAYS_SB|wxLB_SINGLE); - Msg->SetForegroundColour(wxColour(200,0,0) ); - - if ( g_LibName_List ) - { - LibNameItem * libnamestruct = g_LibName_List->FirstLib; - - for ( ; libnamestruct != NULL; libnamestruct = libnamestruct->Pnext ) - { - ListLibr->Append(libnamestruct->m_Name); - } - } - - -wxString text; -#define DELTA_VPOS 17 - size.x = 120; size.y = 90; - pos.y = 100; pos.x = 10; - new wxStaticBox(this, -1,_("Files ext:"), pos, size); - - pos.x += 5; pos.y += DELTA_VPOS; - text = _("Board ext: ") + PcbExtBuffer; - new wxStaticText(this, -1,text , pos); - - pos.x += 5; pos.y += DELTA_VPOS; - text = _("Cmp ext: ") + NetCmpExtBuffer; - new wxStaticText(this, -1,text , pos); - - pos.y += DELTA_VPOS; - text = _("Lib ext: ") + LibExtBuffer; - new wxStaticText(this, -1,text , pos); - - pos.y += DELTA_VPOS; - text = _("Net ext: ") + NetExtBuffer; - new wxStaticText(this, -1,text , pos); - - pos.x = 10; pos.y = 260; - size.x = X_SIZE - pos.x - 10; size.y = -1; - m_TextLibDir = new WinEDA_EnterText(this, - _("Lib Modules Dir:"), g_UserLibDirBuffer, - pos, size); - - pos.y += m_TextLibDir->GetDimension().y + 25; - wxString DocModuleFileName = - EDA_Appl->m_EDA_CommonConfig->Read("module_doc_file", "pcbnew/footprints.pdf"); - m_TextHelpModulesFileName = new WinEDA_EnterText(this, - _("Module Doc File:"), DocModuleFileName, - pos, size); - - size.x = X_SIZE; - size.y = pos.y + m_TextHelpModulesFileName->GetDimension().y + 10; - - SetClientSize(size); -} - - - /*****************************************************************/ - /* Fonctions de base de WinEDA_ConfigFrame: la fenetre de config */ - /*****************************************************************/ - -void WinEDA_ConfigFrame::OnCloseWindow(wxCloseEvent & event) -{ - SetNewOptions(); - EndModal(0); -} - -/********************************************/ -void WinEDA_ConfigFrame::SetNewOptions() -/********************************************/ -{ - g_UserLibDirBuffer = m_TextLibDir->GetData(); - EDA_Appl->m_EDA_CommonConfig->Write("module_doc_file", - m_TextHelpModulesFileName->GetData()); - SetRealLibraryPath("modules"); -} - - -/******************************************************/ -void WinEDA_ConfigFrame::SaveCfg(wxCommandEvent& event) -/******************************************************/ -{ - SetNewOptions(); - m_Parent->Update_config(this); -} - - -/********************************************************/ -void WinEDA_ConfigFrame::LibDelFct(wxCommandEvent& event) -/********************************************************/ -{ -int ii; -wxString LibNameSelected; - - ii = ListLibr->GetSelection(); - if ( ii < 0 ) return; - - LibNameSelected = ListLibr->GetStringSelection(); - - g_LibName_List->RemoveLibName(LibNameSelected); - - ListLibr->Delete(ii); - LibModified = TRUE; -} - - -/*************************************************************/ -void WinEDA_ConfigFrame::LibInsertFct(wxCommandEvent& event) -/*************************************************************/ -/* Insere ou ajoute une librairie a la liste existante: - La nouvelle librairie est mise avant (insert) ou apres (ajout) - la librairie sélectionnée -*/ -{ -int ii; -wxString fullfilename, ShortLibName; -wxString mask ="*"; - - ii = ListLibr->GetSelection(); - if ( ii < 0 ) ii = 0; - if( event.GetId() == ADD_LIB) - { - if( g_LibName_List->FirstLib != NULL ) ii ++; /* Ajout apres selection */ - } - - SetNewOptions(); - mask += LibExtBuffer; - g_RealLibDirBuffer.Replace("\\","/"); - - fullfilename = EDA_FileSelector( _("library files:"), - g_RealLibDirBuffer, /* Chemin par defaut */ - "", /* nom fichier par defaut */ - LibExtBuffer, /* extension par defaut */ - mask, /* Masque d'affichage */ - this, - 0, - TRUE - ); - - if ( fullfilename == "" ) return; - - ShortLibName = - MakeReducedFileName(fullfilename, g_RealLibDirBuffer, LibExtBuffer); - - //Addition ou insertion de la librarire - LibModified = TRUE; -wxString SList[1]; - SList[0] =wxString(ShortLibName); - if ( g_LibName_List->InsertLibName(SList[0], ii) ) - ListLibr->InsertItems(1,SList,ii); - else DisplayError(this, _("Library exists! No Change")); -} - diff --git a/version.txt b/version.txt index e43b0ac867..f503b97251 100644 --- a/version.txt +++ b/version.txt @@ -1,4 +1,4 @@ release version: -09 jul 2007 +09 nov 2007 files (.zip,.tgz): -kicad-2007-07-09 +kicad-2007-11-09