From 04f41a4a7bd6738344132fd2ec0ae6fc2ab8b3e3 Mon Sep 17 00:00:00 2001 From: charras Date: Mon, 18 Jan 2010 12:37:53 +0000 Subject: [PATCH] menu cleaning and changing obscure menu info. and menu labels files cleaning --- bitmaps/CMakeLists.txt | 4 +- .../{add_cotation.xpm => add_dimension.xpm} | 8 +- bitmaps/hotkeys.xpm | 37 + common/CMakeLists.txt | 2 +- common/hotkeys_basic.cpp | 27 +- common/zoom.cpp | 2 - eeschema/class_library.cpp | 5 +- eeschema/menubar.cpp | 26 +- include/bitmaps.h | 3 +- include/pcbstruct.h | 2 +- internat/fr/kicad.mo | Bin 219212 -> 221318 bytes internat/fr/kicad.po | 3222 +++++++++-------- pcbnew/CMakeLists.txt | 2 +- pcbnew/class_board_item.cpp | 2 +- ...class_cotation.cpp => class_dimension.cpp} | 0 .../{class_cotation.h => class_dimension.h} | 6 +- pcbnew/{cotation.cpp => dimension.cpp} | 0 pcbnew/menubar_pcbframe.cpp | 249 +- pcbnew/tool_pcb.cpp | 2 +- 19 files changed, 1863 insertions(+), 1736 deletions(-) rename bitmaps/{add_cotation.xpm => add_dimension.xpm} (84%) create mode 100644 bitmaps/hotkeys.xpm rename pcbnew/{class_cotation.cpp => class_dimension.cpp} (100%) rename pcbnew/{class_cotation.h => class_dimension.h} (98%) rename pcbnew/{cotation.cpp => dimension.cpp} (100%) diff --git a/bitmaps/CMakeLists.txt b/bitmaps/CMakeLists.txt index ee408fd444..62c9068c76 100644 --- a/bitmaps/CMakeLists.txt +++ b/bitmaps/CMakeLists.txt @@ -19,8 +19,9 @@ set(BITMAP_SRCS Add_Circle.xpm Add_Component.xpm Add_Corner.xpm - add_cotation.xpm + add_dimension.xpm Add_Dashed_Line.xpm + add_dimension.xpm Add_Entry.xpm Add_GLabel.xpm add_hierarchical_label.xpm @@ -146,6 +147,7 @@ set(BITMAP_SRCS Hidden_Pin.xpm Hierarchy_cursor.xpm Hierarchy_Nav.xpm + hotkeys.xpm icon_3d.xpm icon_cvpcb_small.xpm icon_cvpcb.xpm diff --git a/bitmaps/add_cotation.xpm b/bitmaps/add_dimension.xpm similarity index 84% rename from bitmaps/add_cotation.xpm rename to bitmaps/add_dimension.xpm index 56f6c5b78b..20515062b7 100644 --- a/bitmaps/add_cotation.xpm +++ b/bitmaps/add_dimension.xpm @@ -1,8 +1,6 @@ /* XPM */ -#ifndef XPMMAIN -extern const char* add_cotation_xpm[]; -#else -const char * add_cotation_xpm[] = { +const char * add_dimension_xpm[] = { +/* columns rows colors const chars-per-pixel */ "16 16 14 1", " c None", ". c #000000", @@ -34,5 +32,3 @@ const char * add_cotation_xpm[] = { "+ + ", "+ + ", " "}; - -#endif diff --git a/bitmaps/hotkeys.xpm b/bitmaps/hotkeys.xpm new file mode 100644 index 0000000000..847c48f6f9 --- /dev/null +++ b/bitmaps/hotkeys.xpm @@ -0,0 +1,37 @@ +/* XPM */ +const char *hotkeys_xpm[] = { +/* columns rows colors chars-per-pixel */ +"16 16 15 1", +"@ c #AFB0AB", +"O c #A5A5A2", +"X c #BCBFBB", +"% c #E7E9E6", +". c #C4C4C4", +"= c #DEDFDD", +"* c #FCFAFC", +"; c #94928D", +" c None", +"+ c #9C9A94", +"& c #F1F3EF", +"$ c #B6B8B3", +"- c #D4D3CF", +"# c #ACAAAC", +"o c #B4B2B4", +/* pixels */ +" ", +" ", +" . ", +" ......XoOO+@ ", +" Xoo##o$. O. ", +" @O ", +" XOo ", +" .OX ", +" OO@@@$$$$$$XX ", +"XX%%&&****&%%o. ", +"O =.- --.==.=X# ", +"+-=========%=-+ ", +"+;;;;;;;;;;;;;O ", +" ", +" ", +" " +}; diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index d38ecbdadb..c583c98b42 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -62,7 +62,7 @@ set(PCB_COMMON_SRCS ../pcbnew/class_board_connected_item.cpp ../pcbnew/class_board_design_settings.cpp ../pcbnew/class_board_item.cpp - ../pcbnew/class_cotation.cpp + ../pcbnew/class_dimension.cpp ../pcbnew/class_drawsegment.cpp ../pcbnew/class_drc_item.cpp ../pcbnew/class_edge_mod.cpp diff --git a/common/hotkeys_basic.cpp b/common/hotkeys_basic.cpp index 7392f0edda..3298ea8f5c 100644 --- a/common/hotkeys_basic.cpp +++ b/common/hotkeys_basic.cpp @@ -615,25 +615,25 @@ wxString ReturnHotkeyConfigFilePath( int choice ) /** add hotkey config options submenu to a menu * @param menu : initial menu */ -void AddHotkeyConfigMenu( wxMenu* menu ) +void AddHotkeyConfigMenu( wxMenu* aMenu ) { + if( aMenu == NULL ) + return; + wxMenuItem* item; wxMenu* HotkeySubmenu = new wxMenu(); - if( menu == NULL ) - return; - - /* Show hotkey configuration */ + /* List existing hotkey menu*/ item = new wxMenuItem( HotkeySubmenu, ID_PREFERENCES_HOTKEY_SHOW_CURRENT_LIST, - _( "Show" ), - _( "Show the current hotkey configuration" ) ); + _( "List Current Keys" ), + _( "Displays the current hotkeys list and corresponding commands" ) ); item->SetBitmap( info_xpm ); HotkeySubmenu->Append( item ); /* (Re)create hotkey file */ item = new wxMenuItem( HotkeySubmenu, ID_PREFERENCES_HOTKEY_CREATE_CONFIG, - _( "(Re)create" ), + _( "(Re)create Hotkeys File" ), _( "Create or recreate the hotkey configuration file from current hotkey list" ) ); item->SetBitmap( save_setup_xpm ); @@ -641,23 +641,22 @@ void AddHotkeyConfigMenu( wxMenu* menu ) /* Reload hotkey file */ item = new wxMenuItem( HotkeySubmenu, ID_PREFERENCES_HOTKEY_READ_CONFIG, - _( "Reload" ), + _( "Reload Hotkeys File" ), _( "Reload the hotkey configuration file" ) ); item->SetBitmap( reload_xpm ); HotkeySubmenu->Append( item ); /* Edit hotkey file */ item = new wxMenuItem( HotkeySubmenu, ID_PREFERENCES_HOTKEY_EDIT_CONFIG, - _( "Edit" ), + _( "Edit Hotkeys File" ), _( "Edit the hotkey configuration file in a text editor" ) ); item->SetBitmap( editor_xpm ); HotkeySubmenu->Append( item ); /* Append HotkeySubmenu to menu */ - menu->Append( ID_PREFERENCES_HOTKEY_SUBMENU, - _("Hotkey"), - HotkeySubmenu, - _("Hotkey configuration and preferences")); + ADD_MENUITEM_WITH_HELP_AND_SUBMENU( aMenu, HotkeySubmenu, + ID_PREFERENCES_HOTKEY_SUBMENU, _( "Hotkeys" ), + _("Hotkeys configuration and preferences" ), hotkeys_xpm ); /* Hotkey path */ wxMenu* HotkeyLocationSubmenu = new wxMenu(); diff --git a/common/zoom.cpp b/common/zoom.cpp index 5d0cc8de48..e115e1476a 100644 --- a/common/zoom.cpp +++ b/common/zoom.cpp @@ -40,9 +40,7 @@ void WinEDA_DrawFrame::Recadre_Trace( bool ToMouse ) /* Move the mouse cursor to the on grid graphic cursor position */ if( ToMouse == TRUE ) - { DrawPanel->MouseToCursorSchema(); - } } diff --git a/eeschema/class_library.cpp b/eeschema/class_library.cpp index e34b564a77..7063d3727a 100644 --- a/eeschema/class_library.cpp +++ b/eeschema/class_library.cpp @@ -510,12 +510,15 @@ bool CMP_LIBRARY::Load( wxString& aErrorMsg ) || !vers.GetNextToken().ToLong( & minor ) || minor < 0L || minor > 99 ) { - wxLogWarning( _( "The component library <%s> header version \ +#if 0 // Note for defeloppers: + // Not sure this warning is very useful: old designs *must* be always loadable + wxLogWarning( wxT( "The component library <%s> header version \ number is invalid.\n\nIn future versions of EESchema this library may not \ load correctly. To resolve this problem open the library in the library \ editor and save it. If this library is the project cache library, save \ the current schematic." ), GetChars( GetName() ) ); +#endif } else { diff --git a/eeschema/menubar.cpp b/eeschema/menubar.cpp index 738cb30775..10927f1078 100644 --- a/eeschema/menubar.cpp +++ b/eeschema/menubar.cpp @@ -52,25 +52,31 @@ void WinEDA_SchematicFrame::ReCreateMenuBar() /* Open Recent submenu */ wxMenu* openRecentMenu = new wxMenu(); wxGetApp().m_fileHistory.AddFilesToMenu( openRecentMenu ); - filesMenu->AppendSubMenu( openRecentMenu, _( "Open &Recent" ), - _( "Open a recent opened document" ) ); + ADD_MENUITEM_WITH_HELP_AND_SUBMENU( filesMenu, openRecentMenu, + -1, _( "Open &Recent" ), + _("Open a recent opened schematic project" ), open_project_xpm ); - item = new wxMenuItem( filesMenu, ID_SAVE_ONE_SHEET, _( "&Save" ), + // Save menus: + filesMenu->AppendSeparator(); + + // Normal save command: + item = new wxMenuItem( filesMenu, ID_SAVE_PROJECT, _( "&Save Whole Schematic Project" ), + _( "Save all sheets in the schematic project" ) ); + item->SetBitmap( save_project_xpm ); + filesMenu->Append( item ); + + // Save current sheet only + item = new wxMenuItem( filesMenu, ID_SAVE_ONE_SHEET, _( "&Save Current Sheet Only" ), _( "Save only current schematic sheet" ) ); item->SetBitmap( save_xpm ); filesMenu->Append( item ); - item = new wxMenuItem( filesMenu, ID_SAVE_ONE_SHEET_AS, _( "Save &as..." ), + // Save current sheet only and ask for a new name + item = new wxMenuItem( filesMenu, ID_SAVE_ONE_SHEET_AS, _( "Save Current Sheet &as..." ), _( "Save current schematic sheet as..." ) ); item->SetBitmap( save_as_xpm ); filesMenu->Append( item ); - filesMenu->AppendSeparator(); - item = new wxMenuItem( filesMenu, ID_SAVE_PROJECT, _( "&Save Project" ), - _( "Save all sheets in the schematic project" ) ); - item->SetBitmap( save_project_xpm ); - filesMenu->Append( item ); - filesMenu->AppendSeparator(); // Print and Plot section: diff --git a/include/bitmaps.h b/include/bitmaps.h index 71cf06238a..7ba4d08411 100644 --- a/include/bitmaps.h +++ b/include/bitmaps.h @@ -12,8 +12,8 @@ extern const char* add_bus_xpm[]; extern const char* add_circle_xpm[]; extern const char* add_component_xpm[]; extern const char* add_corner_xpm[]; -extern const char* add_cotation_xpm[]; extern const char* add_dashed_line_xpm[]; +extern const char* add_dimension_xpm[]; extern const char* add_entry_xpm[]; extern const char* add_glabel_xpm[]; extern const char* add_hierarchical_label_xpm[]; @@ -139,6 +139,7 @@ extern const char* help_xpm[]; extern const char* hidden_pin_xpm[]; extern const char* hierarchy_cursor_xpm[]; extern const char* hierarchy_nav_xpm[]; +extern const char* hotkeys_xpm[]; extern const char* icon_cvpcb_small_xpm[]; extern const char* icon_cvpcb_xpm[]; extern const char* icon_eeschema_xpm[]; diff --git a/include/pcbstruct.h b/include/pcbstruct.h index 692dd2b086..10afdbf404 100644 --- a/include/pcbstruct.h +++ b/include/pcbstruct.h @@ -225,7 +225,7 @@ enum DisplayViaMode { #include "class_drawsegment.h" #include "class_pcb_text.h" -#include "class_cotation.h" +#include "class_dimension.h" #include "class_mire.h" #include "class_track.h" #include "class_marker_pcb.h" diff --git a/internat/fr/kicad.mo b/internat/fr/kicad.mo index 1f0655f13e6253ac046adf7ee2237382a320245a..304713ae445507ec478f98f518f86ca8897aa109 100644 GIT binary patch delta 67780 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Ξ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 L;Vpu$r~iKdnHY`j delta 65812 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 diff --git a/internat/fr/kicad.po b/internat/fr/kicad.po index 087e370567..fad8544ddb 100644 --- a/internat/fr/kicad.po +++ b/internat/fr/kicad.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: kicad\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-09 21:49+0100\n" -"PO-Revision-Date: 2010-01-09 21:58+0100\n" +"POT-Creation-Date: 2010-01-18 14:19+0100\n" +"PO-Revision-Date: 2010-01-18 14:19+0100\n" "Last-Translator: \n" "Language-Team: kicad team \n" "MIME-Version: 1.0\n" @@ -83,10 +83,6 @@ msgstr "Ecriture fichier CI: " msgid "Failed to create " msgstr "Impossible de créer fichier " -#: pcbnew/pcbnew.cpp:80 -msgid "Pcbnew is already running, Continue?" -msgstr "Pcbnew est en cours d'exécution. Continuer ?" - #: pcbnew/dialog_gendrill.cpp:165 msgid "Millimeters" msgstr "Millimètres" @@ -267,13 +263,11 @@ msgstr "Via Enterrées:" #: pcbnew/dialog_gendrill.cpp:293 #: pcbnew/block.cpp:167 -#: pcbnew/cotation.cpp:104 msgid "OK" msgstr "OK" #: pcbnew/dialog_gendrill.cpp:297 #: pcbnew/block.cpp:164 -#: pcbnew/cotation.cpp:107 msgid "Cancel" msgstr "Annuler" @@ -286,12 +280,9 @@ msgid "Search footprint" msgstr "Cherche Module" #: pcbnew/modules.cpp:310 -msgid "Delete Module" -msgstr "Supprimer Module" - -#: pcbnew/modules.cpp:311 -msgid "Value " -msgstr "Valeur " +#, c-format +msgid "Delete Module %s (value %s) ?" +msgstr "Supprimer Module %s (valeur %s) ?" #: pcbnew/set_grid.cpp:125 msgid "mm" @@ -357,34 +348,6 @@ msgstr "Déplacer Bloc" msgid "Copy Block" msgstr "Copie Bloc" -#: pcbnew/cotation.cpp:85 -msgid "Dimension properties" -msgstr "Propriétés des Cotes" - -#: pcbnew/cotation.cpp:110 -msgid "Normal" -msgstr "Normal" - -#: pcbnew/cotation.cpp:110 -msgid "Mirror" -msgstr "Miroir" - -#: pcbnew/cotation.cpp:111 -msgid "Display" -msgstr "Affichage" - -#: pcbnew/cotation.cpp:122 -msgid "Size" -msgstr "Taille " - -#: pcbnew/cotation.cpp:126 -msgid "Width" -msgstr "Epaisseur" - -#: pcbnew/cotation.cpp:130 -msgid "Layer:" -msgstr "Couche:" - #: pcbnew/surbrill.cpp:33 msgid "Filter for net names:" msgstr "Filtre pour nets:" @@ -830,6 +793,10 @@ msgstr "Forme complexe" msgid "Read Shape Description File..." msgstr "Lire Fichier de Description de Forme..." +#: pcbnew/muonde.cpp:856 +msgid "Normal" +msgstr "Normal" + #: pcbnew/muonde.cpp:856 msgid "Symmetrical" msgstr "Symétrique" @@ -842,6 +809,10 @@ msgstr "Miroir" msgid "Shape Option" msgstr "Option Forme" +#: pcbnew/muonde.cpp:864 +msgid "Size" +msgstr "Taille " + #: pcbnew/muonde.cpp:918 msgid "Read descr shape file" msgstr "Lire fichier de description de forme" @@ -921,6 +892,8 @@ msgid "Save Component Files" msgstr "Sauver Fichier Composant" #: pcbnew/xchgmod.cpp:592 +#: pcbnew/gendrill.cpp:322 +#: pcbnew/gendrill.cpp:830 msgid "Unable to create file " msgstr "Impossible de créer le fichier " @@ -1120,13 +1093,21 @@ msgstr "Module %s trouvé, mais verrouillé" msgid "Delete module?" msgstr "Effacer Module?" -#: pcbnew/editrack.cpp:807 -msgid "Track Len" -msgstr "Long. Piste" +#: pcbnew/pcbframe.cpp:330 +msgid "Board modified, Save before exit ?" +msgstr "Circuit Imprimé modifié, Sauver avant de quitter ?" -#: pcbnew/editrack.cpp:811 -msgid "Segs Count" -msgstr "Nb Segms" +#: pcbnew/pcbframe.cpp:331 +msgid "Confirmation" +msgstr "Confirmation" + +#: pcbnew/pcbframe.cpp:370 +msgid "3D Frame already opened" +msgstr "Fenêtre 3D déjà ouverte" + +#: pcbnew/pcbframe.cpp:374 +msgid "3D Viewer" +msgstr "Visu 3D" #: pcbnew/netlist.cpp:118 #, c-format @@ -1199,22 +1180,6 @@ msgstr "Fichier <%s> non trouvé, Netliste utilisée pour sélection des module msgid "Component [%s]: footprint <%s> not found" msgstr "Composant [%s]: Module <%s> non trouvé en librairie" -#: pcbnew/pcbframe.cpp:320 -msgid "Board modified, Save before exit ?" -msgstr "Circuit Imprimé modifié, Sauver avant de quitter ?" - -#: pcbnew/pcbframe.cpp:321 -msgid "Confirmation" -msgstr "Confirmation" - -#: pcbnew/pcbframe.cpp:360 -msgid "3D Frame already opened" -msgstr "Fenêtre 3D déjà ouverte" - -#: pcbnew/pcbframe.cpp:364 -msgid "3D Viewer" -msgstr "Visu 3D" - #: pcbnew/gendrill.cpp:29 msgid "Drill files (*.drl)|*.drl" msgstr "Fichiers de Perçage (*.drl)|*.drl" @@ -1288,6 +1253,11 @@ msgstr "COTATION" msgid "PCB Text" msgstr "Texte PCB" +#: pcbnew/class_pcb_text.cpp:233 +#: pcbnew/class_pcb_text.cpp:235 +msgid "Mirror" +msgstr "Miroir" + #: pcbnew/class_pcb_text.cpp:233 msgid "No" msgstr "Non" @@ -1296,6 +1266,11 @@ msgstr "Non" msgid "Yes" msgstr "Oui" +#: pcbnew/class_pcb_text.cpp:241 +#: pcbnew/mirepcb.cpp:112 +msgid "Width" +msgstr "Epaisseur" + #: pcbnew/loadcmp.cpp:101 msgid "Place Module" msgstr "Place Module" @@ -1658,6 +1633,7 @@ msgid "Current Footprint will be lost and this operation cannot be undone. Conti msgstr "Le module actuel sera perdu et cette opération ne pourra pas être annulée. Continuer ?" #: pcbnew/controle.cpp:175 +#: pcbnew/modedit.cpp:81 msgid "Selection Clarification" msgstr "Clarification de la Sélection" @@ -1891,7 +1867,6 @@ msgid "Place anchor" msgstr "Place Ancre" #: pcbnew/modedit.cpp:459 -#: pcbnew/edit.cpp:577 msgid "Delete item" msgstr "Suppression d'éléments" @@ -1977,383 +1952,420 @@ msgstr "Chercher Marqueur" msgid "Find Next Marker" msgstr "Marqueur Suivant" -#: pcbnew/menubarpcb.cpp:29 -msgid "&New Board" -msgstr "&Nouveau Circuit Imprimé" +#: pcbnew/editrack.cpp:807 +msgid "Track Len" +msgstr "Long. Piste" -#: pcbnew/menubarpcb.cpp:30 -msgid "Clear old board and initialize a new one" -msgstr "Effacer ancien C.I. et créer un nouveau" +#: pcbnew/editrack.cpp:811 +msgid "Segs Count" +msgstr "Nb Segms" -#: pcbnew/menubarpcb.cpp:35 -msgid "&Load Board" -msgstr "Charger Circuit Imprimé" +#: pcbnew/menubar_pcbframe.cpp:39 +msgid "&New" +msgstr "&Nouveau" -#: pcbnew/menubarpcb.cpp:36 -msgid "Delete old board and load new board" -msgstr "Effacer ancien C.I. et charger un nouveau" +#: pcbnew/menubar_pcbframe.cpp:40 +msgid "Clear current board and initialize a new one" +msgstr "Effacer l'ancien C.I. et initialiser un nouveau" -#: pcbnew/menubarpcb.cpp:41 -msgid "Append Board" -msgstr "Ajouter Circuit Imprimé" +#: pcbnew/menubar_pcbframe.cpp:45 +msgid "&Open" +msgstr "&Ouvrir " -#: pcbnew/menubarpcb.cpp:42 -msgid "Add board to old board" -msgstr "Ajouter un C.I. au C.I. actuel" +#: pcbnew/menubar_pcbframe.cpp:46 +msgid "Delete current board and load new board" +msgstr "Effacer l'ancien C.I. et charger un nouveau" -#: pcbnew/menubarpcb.cpp:47 -msgid "&Rescue" -msgstr "&Secours" +#: pcbnew/menubar_pcbframe.cpp:54 +msgid "Open &Recent" +msgstr "Ouvrir &Recent" -#: pcbnew/menubarpcb.cpp:48 -msgid "Clear old board and get last rescue file" -msgstr "Effacer C.I. actuel et reprendre le dernier fichier secours" +#: pcbnew/menubar_pcbframe.cpp:55 +msgid "Open a recent opened board" +msgstr "Ouvrir un circuit impirmé récemment ouvert" -#: pcbnew/menubarpcb.cpp:53 -msgid "&Previous Version" -msgstr "&Précédente Version" +#: pcbnew/menubar_pcbframe.cpp:59 +msgid "&Append Board" +msgstr "&Ajouter Circuit Imprimé" -#: pcbnew/menubarpcb.cpp:54 -msgid "Clear old board and get old version of board" -msgstr "Effacer le C.I. actuel et reprendre l'ancienne version" +#: pcbnew/menubar_pcbframe.cpp:60 +msgid "Append a other PCBNew board to the current loaded board" +msgstr "Ajouter un nouveau circuit imprimé au circuit courant" -#: pcbnew/menubarpcb.cpp:61 -msgid "&Save Board\tCtrl-S" -msgstr "&Sauver Circuit Imprimé (Ctrl S)" +#: pcbnew/menubar_pcbframe.cpp:69 +#: pcbnew/menubar_pcbframe.cpp:406 +msgid "&Save" +msgstr "&Sauver" -#: pcbnew/menubarpcb.cpp:62 +#: pcbnew/menubar_pcbframe.cpp:70 msgid "Save current board" msgstr "Sauver le C.I. actuel" -#: pcbnew/menubarpcb.cpp:67 -msgid "Save Board as..." -msgstr "Sauver C.I. sous.." +#: pcbnew/menubar_pcbframe.cpp:76 +msgid "Save as..." +msgstr "Sauver sous..." -#: pcbnew/menubarpcb.cpp:68 -msgid "Save current board as.." +#: pcbnew/menubar_pcbframe.cpp:77 +msgid "Save the current board as.." msgstr "Sauver le Circuit Imprimé courant sous.." -#: pcbnew/menubarpcb.cpp:74 -msgid "P&rint" -msgstr "Imp&rimer" +#: pcbnew/menubar_pcbframe.cpp:86 +msgid "&Revert" +msgstr "&Reprendre ancien" -#: pcbnew/menubarpcb.cpp:75 -msgid "Print pcb board" -msgstr "Imprimer C.I." +#: pcbnew/menubar_pcbframe.cpp:87 +msgid "Clear board and get previous saved version of board" +msgstr "Effacer le C.I. actuel et reprendre l'ancienne version sauvegardée" -#: pcbnew/menubarpcb.cpp:79 -msgid "Print S&VG" -msgstr "Impression S&VG" +#: pcbnew/menubar_pcbframe.cpp:92 +msgid "&Rescue" +msgstr "&Secours" -#: pcbnew/menubarpcb.cpp:80 -msgid "Plot pcb board in SVG format" -msgstr "Tracer le circuit imprimé en format SVG" +#: pcbnew/menubar_pcbframe.cpp:93 +msgid "Clear old board and get last rescue file" +msgstr "Effacer C.I. actuel et reprendre le dernier fichier secours" -#: pcbnew/menubarpcb.cpp:85 -msgid "&Plot" -msgstr "&Tracer" +#: pcbnew/menubar_pcbframe.cpp:104 +msgid "&Modules Position" +msgstr "Fichier &Modules Position" -#: pcbnew/menubarpcb.cpp:86 -msgid "Plot (HPGL, PostScript, or Gerber format)" -msgstr "Tracer ( format HPGL, POSTSCRIPT ou GERBER)" +#: pcbnew/menubar_pcbframe.cpp:105 +msgid "Generate modules position file for pick and place" +msgstr "Générer le fichier de position des modules pour machine d'insersion" -#: pcbnew/menubarpcb.cpp:95 -msgid "&Specctra DSN" -msgstr "&Specctra DSN" +#: pcbnew/menubar_pcbframe.cpp:110 +msgid "&Drill File" +msgstr "&Fichier de Perçage" -#: pcbnew/menubarpcb.cpp:96 -msgid "Export the current board to a \"Specctra DSN\" file" -msgstr "Exporte le CI courant dans un fichier au format \"Specctra DSN\"" - -#: pcbnew/menubarpcb.cpp:101 -msgid "&GenCAD" -msgstr "&GenCAD" - -#: pcbnew/menubarpcb.cpp:101 -msgid "Export GenCAD Format" -msgstr "Exporter en Format GenCAD" - -#: pcbnew/menubarpcb.cpp:106 -msgid "&Module Report" -msgstr "Rapport &Modules" - -#: pcbnew/menubarpcb.cpp:107 -msgid "Create a board report (footprint report)" -msgstr "Créer un fichier rapport (rapport sur modules)" - -#: pcbnew/menubarpcb.cpp:111 -msgid "&Export" -msgstr "&Exporter" - -#: pcbnew/menubarpcb.cpp:112 -msgid "Export board" -msgstr "Exporter le C.I." - -#: pcbnew/menubarpcb.cpp:120 -msgid "&Specctra Session" -msgstr "&Specctra Session" - -#: pcbnew/menubarpcb.cpp:121 -msgid "Import a routed \"Specctra Session\" (*.ses) file" -msgstr "Importer un fichier de routage \"Specctra Session\" (*.ses) " - -#: pcbnew/menubarpcb.cpp:134 -msgid "Import" -msgstr "Importer" - -#: pcbnew/menubarpcb.cpp:135 -msgid "Import files" -msgstr "Importer fichiers" - -#: pcbnew/menubarpcb.cpp:143 -msgid "Add New Footprints" -msgstr "Ajouter Nouveaux Modules" - -#: pcbnew/menubarpcb.cpp:144 -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:148 -msgid "Create Footprint Archive" -msgstr "Créer Archive des Modules" - -#: pcbnew/menubarpcb.cpp:149 -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:154 -msgid "Archive Footprints" -msgstr "Archiver Modules" - -#: pcbnew/menubarpcb.cpp:155 -msgid "Archive or add footprints in a library file" -msgstr "Archiver ou ajouter les modules dans un fichier librairie" - -#: pcbnew/menubarpcb.cpp:160 -msgid "E&xit" -msgstr "&Quitter" - -#: pcbnew/menubarpcb.cpp:161 -msgid "Quit PCBnew" -msgstr "Quitter PCBnew" - -#: pcbnew/menubarpcb.cpp:171 -msgid "&Library" -msgstr "&Librairie" - -#: pcbnew/menubarpcb.cpp:172 -msgid "Setting libraries, directories and others..." -msgstr "Sélectionner les librairies , répertoires et autres" - -#: pcbnew/menubarpcb.cpp:177 -msgid "&Colors and Visibility" -msgstr "&Couleurs et Visibilité" - -#: pcbnew/menubarpcb.cpp:178 -msgid "Select colors and visibility of layers and some items" -msgstr "Sélection les couleurs et l' affichage des couches et de certains éléments du C.I." - -#: pcbnew/menubarpcb.cpp:182 -msgid "&General" -msgstr "&Général " - -#: pcbnew/menubarpcb.cpp:183 -msgid "Select general options for PCBnew" -msgstr " Sélection options générales pour PCBNEW" - -#: pcbnew/menubarpcb.cpp:188 -msgid "&Display" -msgstr "&Affichage" - -#: pcbnew/menubarpcb.cpp:189 -msgid "Select how items (pads, tracks texts ... ) are displayed" -msgstr "Sélectionner comment les éléments (pads, pistes, textes ...) sont affichés" - -#: pcbnew/menubarpcb.cpp:198 -msgid "&Save Preferences" -msgstr "&Sauver Préférences" - -#: pcbnew/menubarpcb.cpp:199 -msgid "Save application preferences" -msgstr "Sauver les préférences de l'application" - -#: pcbnew/menubarpcb.cpp:203 -msgid "&Read Preferences" -msgstr "&Lire Préférences" - -#: pcbnew/menubarpcb.cpp:204 -msgid "Read application preferences" -msgstr "Lire les préférences de l'application" - -#: pcbnew/menubarpcb.cpp:214 -msgid "Design Rules" -msgstr "Règles de Conception" - -#: pcbnew/menubarpcb.cpp:215 -msgid "Open the design rules dialog editor" -msgstr "Ouvrir la fenêtre de dialogue de l'éditeur de règles de conception" - -#: pcbnew/menubarpcb.cpp:219 -msgid "&Layers Setup" -msgstr "&Options Couches" - -#: pcbnew/menubarpcb.cpp:220 -msgid "Enable and set properties of layers" -msgstr "Activer les couches et ajuster leur propriétés" - -#: pcbnew/menubarpcb.cpp:231 -msgid "Pads Mask Clearance" -msgstr "Marge Masque des Pads" - -#: pcbnew/menubarpcb.cpp:232 -msgid "Adjust the global clearance between pads and the solder resist mask" -msgstr "Ajuster la marge globale entre pads et le masque de vernis épargne" - -#: pcbnew/menubarpcb.cpp:237 -msgid "Adjust User Grid" -msgstr "Ajuster Grille utilisateur" - -#: pcbnew/menubarpcb.cpp:242 -msgid "Texts and Drawings" -msgstr "Textes et Tracés" - -#: pcbnew/menubarpcb.cpp:243 -msgid "Adjust width for texts and drawings" -msgstr "Ajuster dims pour textes et graphiques" - -#: pcbnew/menubarpcb.cpp:247 -msgid "Pads" -msgstr "Pads" - -#: pcbnew/menubarpcb.cpp:248 -msgid "Adjust size,shape,layers... for pads" -msgstr "Ajuster taille, forme, couches... pour pads" - -#: pcbnew/menubarpcb.cpp:253 -msgid "&Save Setup" -msgstr "&Sauver Options" - -#: pcbnew/menubarpcb.cpp:254 -msgid "Save options in current directory" -msgstr "Sauver les options en répertoire de travail" - -#: pcbnew/menubarpcb.cpp:260 -msgid "Generate &Modules Position" -msgstr "Créer &Modules Position" - -#: pcbnew/menubarpcb.cpp:261 -msgid "Generate modules position file" -msgstr "Gen fichier Position des Modules" - -#: pcbnew/menubarpcb.cpp:266 -msgid "Create &Drill File" -msgstr "Créer &Fichier de Perçage" - -#: pcbnew/menubarpcb.cpp:267 +#: pcbnew/menubar_pcbframe.cpp:111 msgid "Generate excellon2 drill file" msgstr "Créer Fichier de perçage Excellon2" -#: pcbnew/menubarpcb.cpp:272 -msgid "Create &Component File" -msgstr "Créer &Fichier Cmp" +#: pcbnew/menubar_pcbframe.cpp:117 +msgid "&Component File" +msgstr "Fichier de &Composants" -#: pcbnew/menubarpcb.cpp:273 -msgid "Recreate .cmp file for CvPcb" -msgstr "Recréer le fichier .cmp pour CvPcb" +#: pcbnew/menubar_pcbframe.cpp:118 +msgid "(Re)create components file for CvPcb" +msgstr "(Re)créer le fichier de compsants *.cmp pour CvPcb" -#: pcbnew/menubarpcb.cpp:278 -msgid "Create &BOM File" -msgstr "Créer Fichier Liste du &Matériel" +#: pcbnew/menubar_pcbframe.cpp:124 +msgid "&BOM File" +msgstr "Liste du &Matériel" -#: pcbnew/menubarpcb.cpp:279 -msgid "Recreate .csv file for CvPcb" -msgstr "Recréer le fichier .csv pour CvPcb" +#: pcbnew/menubar_pcbframe.cpp:125 +msgid "Create a bill of materials from schematic" +msgstr "Créer lune liste de matériel de la schématique" -#: pcbnew/menubarpcb.cpp:285 +#: pcbnew/menubar_pcbframe.cpp:131 +msgid "Fabrication Outputs" +msgstr "Fichiers de Fabrication" + +#: pcbnew/menubar_pcbframe.cpp:132 +msgid "Generate files for fabrication" +msgstr "Générer des fichiers utiles pour la fabrication du circuit" + +#: pcbnew/menubar_pcbframe.cpp:139 +msgid "&Specctra Session" +msgstr "&Specctra Session" + +#: pcbnew/menubar_pcbframe.cpp:140 +msgid "Import a routed \"Specctra Session\" (*.ses) file" +msgstr "Importer un fichier de routage \"Specctra Session\" (*.ses) " + +#: pcbnew/menubar_pcbframe.cpp:154 +msgid "Import" +msgstr "Importer" + +#: pcbnew/menubar_pcbframe.cpp:155 +msgid "Import files" +msgstr "Importer fichiers" + +#: pcbnew/menubar_pcbframe.cpp:163 +msgid "&Specctra DSN" +msgstr "&Specctra DSN" + +#: pcbnew/menubar_pcbframe.cpp:164 +msgid "Export the current board to a \"Specctra DSN\" file" +msgstr "Exporte le CI courant dans un fichier au format \"Specctra DSN\"" + +#: pcbnew/menubar_pcbframe.cpp:170 +msgid "&GenCAD" +msgstr "&GenCAD" + +#: pcbnew/menubar_pcbframe.cpp:170 +msgid "Export GenCAD Format" +msgstr "Exporter en Format GenCAD" + +#: pcbnew/menubar_pcbframe.cpp:176 +msgid "&Module Report" +msgstr "Rapport &Modules" + +#: pcbnew/menubar_pcbframe.cpp:177 +msgid "Create a report of all modules on the current board" +msgstr "Créer un fichier rapport de tous les modules du C.I." + +#: pcbnew/menubar_pcbframe.cpp:181 +msgid "&Export" +msgstr "&Exporter" + +#: pcbnew/menubar_pcbframe.cpp:182 +msgid "Export board" +msgstr "Exporter le C.I." + +#: pcbnew/menubar_pcbframe.cpp:188 +msgid "P&rint" +msgstr "Imp&rimer" + +#: pcbnew/menubar_pcbframe.cpp:189 +msgid "Print pcb board" +msgstr "Imprimer C.I." + +#: pcbnew/menubar_pcbframe.cpp:194 +msgid "Print S&VG" +msgstr "Impression S&VG" + +#: pcbnew/menubar_pcbframe.cpp:195 +msgid "Plot board in Scalable Vector Graphics format" +msgstr "Tracer le circuit imprimé en format SVG (Scalable Vector Graphics)" + +#: pcbnew/menubar_pcbframe.cpp:200 +msgid "&Plot" +msgstr "&Tracer" + +#: pcbnew/menubar_pcbframe.cpp:201 +msgid "Plot board in HPGL, PostScript or Gerber RS-274X format)" +msgstr "Tracer le circuit en format HPGL, POSTSCRIPT ou GERBER RS-274X" + +#: pcbnew/menubar_pcbframe.cpp:209 +msgid "Add New Footprints" +msgstr "Ajouter Nouveaux Modules" + +#: pcbnew/menubar_pcbframe.cpp:211 +msgid "Archive new footprints only in a library (keep other footprints in this lib)" +msgstr "Archiver nouveaux modules seuls dans une librairie (garder les autres modules de cette librairie)" + +#: pcbnew/menubar_pcbframe.cpp:215 +msgid "Create Footprint Archive" +msgstr "Créer Archive des Modules" + +#: pcbnew/menubar_pcbframe.cpp:216 +msgid "Archive all footprints in a library(old lib will be deleted)" +msgstr "Archiver tous les modules dans une librairie (ancienne librairie supprimée)" + +#: pcbnew/menubar_pcbframe.cpp:221 +msgid "Archive Footprints" +msgstr "Archiver Modules" + +#: pcbnew/menubar_pcbframe.cpp:222 +msgid "Archive or add footprints in a library file" +msgstr "Archiver ou ajouter les modules dans un fichier librairie" + +#: pcbnew/menubar_pcbframe.cpp:227 +msgid "&Quit" +msgstr "&Quitter" + +#: pcbnew/menubar_pcbframe.cpp:228 +msgid "Quit PCBNew" +msgstr "Quitter PCBnew" + +#: pcbnew/menubar_pcbframe.cpp:240 +msgid "Undo" +msgstr "Undo" + +#: pcbnew/menubar_pcbframe.cpp:247 +msgid "Redo" +msgstr "Redo" + +#: pcbnew/menubar_pcbframe.cpp:256 +msgid "&Find..." +msgstr "&Chercher" + +#: pcbnew/menubar_pcbframe.cpp:258 +msgid "Find components and text in current loaded board" +msgstr "Recherche de composants et textes sur le circuit" + +#: pcbnew/menubar_pcbframe.cpp:267 msgid "Global &Deletions" msgstr "Effacements &Généraux" -#: pcbnew/menubarpcb.cpp:286 +#: pcbnew/menubar_pcbframe.cpp:268 msgid "Delete tracks, modules, texts... on board" msgstr "Effacer pistes, modules, textes... sur le C.I." -#: pcbnew/menubarpcb.cpp:291 -msgid "&List Nets" -msgstr "Liste Equipots" +#: pcbnew/menubar_pcbframe.cpp:274 +msgid "&Tracks" +msgstr "&Pistes" -#: pcbnew/menubarpcb.cpp:292 -msgid "List nets (names and id)" -msgstr "Lister équipotentielles (noms et numéros d'identification)" - -#: pcbnew/menubarpcb.cpp:297 -msgid "&Track Operations" -msgstr "Opéra&tions sur Pistes" - -#: pcbnew/menubarpcb.cpp:298 +#: pcbnew/menubar_pcbframe.cpp:276 msgid "Clean stubs, vias, delete break points, or connect dangling tracks to pads and vias" msgstr "Nettoyer bouts de pistes, vias, points inutiles, ou connecter extrémités de pistes mal connectées au centre de pads ou vias" -#: pcbnew/menubarpcb.cpp:303 +#: pcbnew/menubar_pcbframe.cpp:282 msgid "&Swap Layers" msgstr "&Permutte Couches" -#: pcbnew/menubarpcb.cpp:304 +#: pcbnew/menubar_pcbframe.cpp:283 msgid "Swap tracks on copper layers or drawings on others layers" msgstr "Permutation de couches" -#: pcbnew/menubarpcb.cpp:312 -msgid "&Contents" -msgstr "&Contenu" +#: pcbnew/menubar_pcbframe.cpp:330 +msgid "&List Nets" +msgstr "Liste Equipots" -#: pcbnew/menubarpcb.cpp:313 -msgid "Open the PCBnew manual" -msgstr "Ouvrir la documentation de PCPnew" +#: pcbnew/menubar_pcbframe.cpp:331 +msgid "View a list of nets with names and id's" +msgstr "Lister les équipotentielles (noms et numéros d'identification)" -#: pcbnew/menubarpcb.cpp:317 -msgid "&About PCBnew" -msgstr "&Au sujet de PCBnew" - -#: pcbnew/menubarpcb.cpp:318 -msgid "About PCBnew printed circuit board designer" -msgstr "Au Sujet de PCBnew outil de conception de C.I." - -#: pcbnew/menubarpcb.cpp:327 +#: pcbnew/menubar_pcbframe.cpp:338 msgid "3D Display" msgstr "3D Visu" -#: pcbnew/menubarpcb.cpp:327 -msgid "Show board in 3D viewer" +#: pcbnew/menubar_pcbframe.cpp:338 +msgid "Show board in the 3D viewer" msgstr "Visualisation du circuit en 3D" -#: pcbnew/menubarpcb.cpp:331 +#: pcbnew/menubar_pcbframe.cpp:349 +msgid "&Library" +msgstr "&Librairie" + +#: pcbnew/menubar_pcbframe.cpp:350 +msgid "Setting libraries, directories and others..." +msgstr "Sélectionner les librairies , répertoires et autres" + +#: pcbnew/menubar_pcbframe.cpp:356 +msgid "&Colors and Visibility" +msgstr "&Couleurs et Visibilité" + +#: pcbnew/menubar_pcbframe.cpp:357 +msgid "Select colors and visibility of layers and some items" +msgstr "Sélection les couleurs et l' affichage des couches et de certains éléments du C.I." + +#: pcbnew/menubar_pcbframe.cpp:362 +msgid "&General" +msgstr "&Général " + +#: pcbnew/menubar_pcbframe.cpp:363 +msgid "Select general options for PCBnew" +msgstr " Sélection options générales pour PCBNEW" + +#: pcbnew/menubar_pcbframe.cpp:369 +msgid "&Display" +msgstr "&Affichage" + +#: pcbnew/menubar_pcbframe.cpp:370 +msgid "Select how items (pads, tracks texts ... ) are displayed" +msgstr "Sélectionner comment les éléments (pads, pistes, textes ...) sont affichés" + +#: pcbnew/menubar_pcbframe.cpp:379 +msgid "Adjust user grid dimensions" +msgstr "Ajuster taille grille utilisateur" + +#: pcbnew/menubar_pcbframe.cpp:385 +msgid "Texts and Drawings" +msgstr "Textes et Tracés" + +#: pcbnew/menubar_pcbframe.cpp:386 +msgid "Adjust dimensions for texts and drawings" +msgstr "Ajuster dimensions pour textes et graphiques" + +#: pcbnew/menubar_pcbframe.cpp:391 +msgid "Pads" +msgstr "Pads" + +#: pcbnew/menubar_pcbframe.cpp:392 +msgid "Adjust default pads caracteristics" +msgstr "Ajuster les caracteristiques par défaut des pads" + +#: pcbnew/menubar_pcbframe.cpp:398 +msgid "Pads Mask Clearance" +msgstr "Marge Masque des Pads" + +#: pcbnew/menubar_pcbframe.cpp:399 +msgid "Adjust the global clearance between pads and the solder resist mask" +msgstr "Ajuster la marge globale entre pads et le masque de vernis épargne" + +#: pcbnew/menubar_pcbframe.cpp:407 +msgid "Save dimension preferences" +msgstr "Sauver les préférences de dimension" + +#: pcbnew/menubar_pcbframe.cpp:413 +msgid "Di&mensions" +msgstr "Di&mensions" + +#: pcbnew/menubar_pcbframe.cpp:414 +msgid "Global dimensions preferences" +msgstr "Préférences générales de dimensions" + +#: pcbnew/menubar_pcbframe.cpp:427 +msgid "&Save Preferences" +msgstr "&Sauver Préférences" + +#: pcbnew/menubar_pcbframe.cpp:428 +msgid "Save application preferences" +msgstr "Sauver les préférences de l'application" + +#: pcbnew/menubar_pcbframe.cpp:433 +msgid "&Read Preferences" +msgstr "&Lire Préférences" + +#: pcbnew/menubar_pcbframe.cpp:434 +msgid "Read application preferences" +msgstr "Lire les préférences de l'application" + +#: pcbnew/menubar_pcbframe.cpp:446 +msgid "Design Rules" +msgstr "Règles de Conception" + +#: pcbnew/menubar_pcbframe.cpp:447 +msgid "Open the design rules dialog editor" +msgstr "Ouvrir la fenêtre de dialogue de l'éditeur de règles de conception" + +#: pcbnew/menubar_pcbframe.cpp:452 +msgid "&Layers Setup" +msgstr "&Options Couches" + +#: pcbnew/menubar_pcbframe.cpp:453 +msgid "Enable and set properties of layers" +msgstr "Activer les couches et ajuster leur propriétés" + +#: pcbnew/menubar_pcbframe.cpp:462 +msgid "&Contents" +msgstr "&Contenu" + +#: pcbnew/menubar_pcbframe.cpp:463 +msgid "Open the PCBnew manual" +msgstr "Ouvrir la documentation de PCPnew" + +#: pcbnew/menubar_pcbframe.cpp:467 +msgid "&About" +msgstr "&Au Sujet de" + +#: pcbnew/menubar_pcbframe.cpp:468 +msgid "About PCBnew printed circuit board designer" +msgstr "Au Sujet de PCBnew outil de conception de C.I." + +#: pcbnew/menubar_pcbframe.cpp:476 msgid "&File" msgstr "&Fichiers" -#: pcbnew/menubarpcb.cpp:332 +#: pcbnew/menubar_pcbframe.cpp:477 +msgid "&Edit" +msgstr "&Editer" + +#: pcbnew/menubar_pcbframe.cpp:478 +msgid "&View" +msgstr "&Voir" + +#: pcbnew/menubar_pcbframe.cpp:479 msgid "&Preferences" msgstr "&Préférences" -#: pcbnew/menubarpcb.cpp:333 +#: pcbnew/menubar_pcbframe.cpp:480 msgid "&Design Rules" msgstr "&Règles de Conception" -#: pcbnew/menubarpcb.cpp:334 -msgid "&Dimensions" -msgstr "&Dimensions" - -#: pcbnew/menubarpcb.cpp:335 -msgid "&Miscellaneous" -msgstr "&Divers" - -#: pcbnew/menubarpcb.cpp:336 -msgid "P&ostprocess" -msgstr "P&ostprocesseurs" - -#: pcbnew/menubarpcb.cpp:337 -msgid "&3D Display" -msgstr "&3D Visu" - -#: pcbnew/menubarpcb.cpp:338 +#: pcbnew/menubar_pcbframe.cpp:481 msgid "&Help" msgstr "&Aide" @@ -2490,34 +2502,6 @@ msgstr "Pour une liste de pads non connecté, clic droit pour ouvrir un menu" msgid "Unconnected" msgstr "Non connecté" -#: pcbnew/menubarmodedit.cpp:28 -msgid "Sizes and Widths" -msgstr "Dims. et Epaiss." - -#: pcbnew/menubarmodedit.cpp:34 -msgid "Adjust size, shape, layers... for pads" -msgstr "Ajuster taille, forme, couches... pour pads" - -#: pcbnew/menubarmodedit.cpp:40 -msgid "User Grid Size" -msgstr "Dim Grille utilisteur" - -#: pcbnew/menubarmodedit.cpp:41 -msgid "Adjust user grid" -msgstr "Ajuster grille utilisateur" - -#: pcbnew/menubarmodedit.cpp:55 -msgid "Open the pcbnew manual" -msgstr "Ouvrir la documentation de pcbnew" - -#: pcbnew/menubarmodedit.cpp:63 -msgid "&About pcbnew" -msgstr "&Au sujet de Pcbnew" - -#: pcbnew/menubarmodedit.cpp:64 -msgid "About pcbnew PCB designer" -msgstr "Au sujet de Pcbnew, concption de PCB" - #: pcbnew/moduleframe.cpp:251 msgid "Module Editor: Module modified! Continue?" msgstr "Editeur de Module: Module modifié! Continuer ?" @@ -2538,6 +2522,24 @@ msgstr "Afficher pastilles en mode contour" msgid "Show pads in filled mode" msgstr "Afficher pastilles en mode plein" +#: pcbnew/dimension.cpp:85 +msgid "Dimension properties" +msgstr "Propriétés des Cotes" + +#: pcbnew/dimension.cpp:111 +#: pcbnew/dialog_pcb_text_properties.cpp:170 +msgid "Display" +msgstr "Affichage" + +#: pcbnew/dimension.cpp:130 +#: pcbnew/dialog_copper_zones_base.cpp:211 +msgid "Layer:" +msgstr "Couche:" + +#: pcbnew/pcbnew.cpp:89 +msgid "Pcbnew is already running, Continue?" +msgstr "Pcbnew est en cours d'exécution. Continuer ?" + #: pcbnew/specctra_import.cpp:77 msgid "Merge Specctra Session file:" msgstr "Fichier Specctra Session à Fusionner:" @@ -2929,7 +2931,6 @@ msgstr "Forme delta Y" #: pcbnew/dialog_pad_properties_base.cpp:189 #: pcbnew/dialog_pad_properties_base.cpp:195 -#: pcbnew/class_board_item.cpp:26 msgid "Circle" msgstr "Cercle" @@ -2939,7 +2940,6 @@ msgid "Oval" msgstr "Ovale" #: pcbnew/dialog_pad_properties_base.cpp:189 -#: pcbnew/class_board_item.cpp:24 msgid "Rect" msgstr "Rect" @@ -3068,7 +3068,6 @@ msgid "Pad Type:" msgstr "Type Pad:" #: pcbnew/dialog_pad_properties_base.cpp:314 -#: pcbnew/dialog_SVG_print_base.cpp:23 msgid "Layers:" msgstr "Couches:" @@ -3132,11 +3131,12 @@ msgstr "Fichiers PCB GenCAD 1.4 (.cad)|*.cad" msgid "Save GenCAD Board File" msgstr "Sauver Fichier PCB format GenCAD" -#: pcbnew/dialog_copper_zones.cpp:277 +#: pcbnew/dialog_copper_zones.cpp:280 msgid "Error : Zone clearance is set to an unreasonnable value" msgstr "Erreur: l'isolation de zone est réglée à une valeur déraisonnable." -#: pcbnew/dialog_copper_zones.cpp:288 +#: pcbnew/dialog_copper_zones.cpp:291 +#: pcbnew/zones_non_copper_type_functions.cpp:142 msgid "" "Error :\n" "you must choose a copper min thickness value bigger than 0.001 inch (or 0.0254 mm)" @@ -3144,7 +3144,7 @@ msgstr "" "Erreur :\n" "vous devez choisir une valeur pour l'épaisseur de cuivre dans les freins thermiques plus grande que 0,001 pouce (ou 0,0254 mm)" -#: pcbnew/dialog_copper_zones.cpp:313 +#: pcbnew/dialog_copper_zones.cpp:316 msgid "" "Error :\n" "you must choose a copper bridge value for thermal reliefs bigger than the min zone thickness" @@ -3152,15 +3152,16 @@ msgstr "" "Erreur :\n" "vous devez choisir une valeur pour l'épaisseur de cuivre dans les freins thermiques plus grande que l'épaisseur de cuivre minimum des zones" -#: pcbnew/dialog_copper_zones.cpp:325 +#: pcbnew/dialog_copper_zones.cpp:328 +#: pcbnew/zones_non_copper_type_functions.cpp:178 msgid "Error : you must choose a layer" msgstr "Erreur: Vous devez choisir une couche" -#: pcbnew/dialog_copper_zones.cpp:337 +#: pcbnew/dialog_copper_zones.cpp:340 msgid "Error : you must choose a net name" msgstr "Erreur: Vous devez choisir une équipotentielle" -#: pcbnew/dialog_copper_zones.cpp:344 +#: pcbnew/dialog_copper_zones.cpp:347 msgid "You have chosen the \"not connected\" option. This will create insulated copper islands. Are you sure ?" msgstr "Vous avez choisi l'option \"non connecté\". Cela créera des blocs non connectés. Etes vous sûr ?" @@ -3990,6 +3991,10 @@ msgstr "Garder ou changer une empreinte existante quand la netliste donne une em #: pcbnew/dialog_netlist_fbp.cpp:46 #: pcbnew/dialog_netlist_fbp.cpp:54 +#: pcbnew/onrightclick.cpp:488 +#: pcbnew/onrightclick.cpp:678 +#: pcbnew/onrightclick.cpp:740 +#: pcbnew/onrightclick.cpp:782 msgid "Delete" msgstr "Supprimer" @@ -4111,7 +4116,6 @@ msgid "Cotation not authorized on Copper layers" msgstr "Cotation non autorisée sur Couches Cuivre" #: pcbnew/onrightclick.cpp:64 -#: pcbnew/modedit_onclick.cpp:206 msgid "End Tool" msgstr "Fin Outil" @@ -4269,7 +4273,6 @@ msgid "Reset Unrouted" msgstr "Réinit non Routés" #: pcbnew/onrightclick.cpp:378 -#: pcbnew/modedit_onclick.cpp:216 msgid "Cancel Block" msgstr "Annuler Bloc" @@ -4278,7 +4281,6 @@ msgid "Zoom Block" msgstr "Zoom Bloc" #: pcbnew/onrightclick.cpp:383 -#: pcbnew/modedit_onclick.cpp:222 msgid "Place Block" msgstr "Place Bloc" @@ -4473,18 +4475,19 @@ msgstr "Change côté" #: pcbnew/onrightclick.cpp:641 #: pcbnew/onrightclick.cpp:673 #: pcbnew/onrightclick.cpp:778 -#: pcbnew/modedit_onclick.cpp:321 msgid "Edit" msgstr "Editer" +#: pcbnew/onrightclick.cpp:644 +msgid "Delete Module" +msgstr "Supprimer Module" + #: pcbnew/onrightclick.cpp:670 #: pcbnew/onrightclick.cpp:776 -#: pcbnew/modedit_onclick.cpp:256 msgid "Rotate" msgstr "Rotation" #: pcbnew/onrightclick.cpp:721 -#: pcbnew/modedit_onclick.cpp:273 msgid "Edit Pad" msgstr "Edit Pad" @@ -5150,14 +5153,6 @@ msgstr "Fichier rapport DRC (.rpt)|*.rpt" msgid "Save DRC Report File" msgstr "Sauver Fichier Rapport DRC:" -#: pcbnew/gen_drill_report_files.cpp:263 -msgid "" -" Drill map: Too many diameter values to draw to draw one symbol per drill value (max 13)\n" -"Plot uses circle shape for some drill values" -msgstr "" -"Plan de perçage: trop de diamètres différents pour tracer 1 symbole par diamètre (max 13)\n" -"Le tracé utilise des cercles pour quelques valeurs " - #: pcbnew/dialog_edit_module_for_BoardEditor_base.cpp:24 #: pcbnew/dialog_edit_module_for_Modedit_base.cpp:24 msgid "Fields:" @@ -5353,6 +5348,50 @@ msgstr "Suppr. Forme 3D:" msgid "3D settings" msgstr "3D Caract" +#: pcbnew/menubar_modedit.cpp:28 +msgid "Sizes and Widths" +msgstr "Dims. et Epaiss." + +#: pcbnew/menubar_modedit.cpp:29 +msgid "Adjust width for texts and drawings" +msgstr "Ajuster dims pour textes et graphiques" + +#: pcbnew/menubar_modedit.cpp:34 +msgid "Adjust size, shape, layers... for pads" +msgstr "Ajuster taille, forme, couches... pour pads" + +#: pcbnew/menubar_modedit.cpp:40 +msgid "User Grid Size" +msgstr "Dim Grille utilisteur" + +#: pcbnew/menubar_modedit.cpp:41 +msgid "Adjust user grid" +msgstr "Ajuster grille utilisateur" + +#: pcbnew/menubar_modedit.cpp:55 +msgid "Open the pcbnew manual" +msgstr "Ouvrir la documentation de pcbnew" + +#: pcbnew/menubar_modedit.cpp:63 +msgid "&About pcbnew" +msgstr "&Au sujet de Pcbnew" + +#: pcbnew/menubar_modedit.cpp:64 +msgid "About pcbnew PCB designer" +msgstr "Au sujet de Pcbnew, concption de PCB" + +#: pcbnew/menubar_modedit.cpp:75 +msgid "Show board in 3D viewer" +msgstr "Visualisation du circuit en 3D" + +#: pcbnew/menubar_modedit.cpp:79 +msgid "&Dimensions" +msgstr "&Dimensions" + +#: pcbnew/menubar_modedit.cpp:80 +msgid "&3D Display" +msgstr "&3D Visu" + #: pcbnew/dialog_edit_module_for_Modedit_base.cpp:27 msgid "Doc" msgstr "Doc" @@ -6034,6 +6073,10 @@ msgstr "Afficher autres éléments" msgid "Show page limits" msgstr " Afficher limites de page" +#: pcbnew/layer_panel_base.cpp:57 +msgid "Rendering" +msgstr "Aspect" + #: pcbnew/class_netinfo_item.cpp:132 msgid "Net Name" msgstr "Nom Equipot" @@ -6376,27 +6419,39 @@ msgstr "Ajuster toutes vias (pas les pistes) à leurs valeurs en Netclass" msgid "Set all tracks (no via) to their Netclass value" msgstr "Ajuster toutes Pistes (pas les Vias) à leurs Valeurs en NetClass" -#: pcbnew/layer_widget.cpp:279 -msgid "Right click to change layer color, left click to select layer" -msgstr "" +#: pcbnew/layer_widget.cpp:315 +msgid "Show All Copper Layers" +msgstr "Monter Toutes les Couches Cuivre." -#: pcbnew/layer_widget.cpp:285 +#: pcbnew/layer_widget.cpp:318 +msgid "Show No Copper Layers" +msgstr "Monter aucune Couche Cuivre." + +#: pcbnew/layer_widget.cpp:463 +msgid "Left click to select, middle click for color change, right click for menu" +msgstr "Clquer sur bouton gauche pour selectionner, du milieu pour changer la couleur, drit pour le menu" + +#: pcbnew/layer_widget.cpp:471 msgid "Click here to select this layer" -msgstr "" +msgstr "Cliquer ici pour sélectionner cette couche" -#: pcbnew/layer_widget.cpp:291 +#: pcbnew/layer_widget.cpp:480 msgid "Enable this for visibility" -msgstr "" +msgstr "Activer ceci pour activer la visibilité" -#: pcbnew/layer_widget.cpp:436 +#: pcbnew/layer_widget.cpp:500 +msgid "Middle click for color change" +msgstr "Clicquer sur bouton du milieu pour changer la couleur" + +#: pcbnew/layer_widget.cpp:870 msgid "wxAUI Test" msgstr "" -#: pcbnew/layer_widget.cpp:446 +#: pcbnew/layer_widget.cpp:899 msgid "Pane 2 - sample text" msgstr "" -#: pcbnew/layer_widget.cpp:450 +#: pcbnew/layer_widget.cpp:904 msgid "Main content window" msgstr "" @@ -6580,15 +6635,6 @@ msgstr "Sauver Options" msgid "Generate drill file" msgstr "Créer Fichier de perçage" -#: pcbnew/layer_panel_base.cpp:40 -msgid "Part depiction and visibility" -msgstr "" - -#: pcbnew/layer_panel_base.cpp:48 -#, fuzzy -msgid "Rendering" -msgstr "Fin tracé" - #: pcbnew/toolbars_update_user_interface.cpp:39 msgid " mils" msgstr " mils" @@ -6694,6 +6740,14 @@ msgstr "Valeur incorrecte pour offset du pad" msgid "Unknown netname, no change" msgstr "Net inconnu, pas de changement" +#: pcbnew/gen_drill_report_files.cpp:263 +msgid "" +" Drill map: Too many diameter values to draw to draw one symbol per drill value (max 13)\n" +"Plot uses circle shape for some drill values" +msgstr "" +"Plan de perçage: trop de diamètres différents pour tracer 1 symbole par diamètre (max 13)\n" +"Le tracé utilise des cercles pour quelques valeurs " + #: eeschema/plotps.cpp:165 msgid "Page Size A4" msgstr "Feuille A4" @@ -6751,29 +6805,72 @@ msgstr "Epaiss. ligne par défaut" msgid "Plot: %s\n" msgstr "Trace: %s\n" -#: eeschema/schframe.cpp:346 -msgid "Schematic modified, Save before exit ?" -msgstr "Schématique modifiée, Sauver avant de quitter ?" +#: eeschema/libframe.cpp:292 +msgid "" +"Component was modified!\n" +"Discard changes?" +msgstr "" +"Le composant a été modifié\n" +"Perdre les changements" -#: eeschema/schframe.cpp:481 -msgid "Draw wires and buses in any direction" -msgstr "Tracer les fils et bus avec direction quelconque" +#: eeschema/libframe.cpp:305 +#, c-format +msgid "" +"Library \"%s\" was modified!\n" +"Discard changes?" +msgstr "" +"Librairie \"%s\" modifiée!\n" +"Perdre les changements ?" -#: eeschema/schframe.cpp:482 -msgid "Draw horizontal and vertical wires and buses only" -msgstr "Autoriser fils et bus verticaux et horizontaux seulement" +#: eeschema/libframe.cpp:415 +#, c-format +msgid "Part %c" +msgstr "Composant %c" -#: eeschema/schframe.cpp:492 -msgid "Do not show hidden pins" -msgstr "Ne pas affichager les pins invisibles" +#: eeschema/libframe.cpp:677 +msgid "Add pin" +msgstr "Addition de \"pins\"" -#: eeschema/schframe.cpp:493 -msgid "Show hidden pins" -msgstr "Force affichage des pins invisibles" +#: eeschema/libframe.cpp:681 +msgid "Set pin options" +msgstr "Choix options de pin" -#: eeschema/schframe.cpp:584 -msgid "Schematic" -msgstr "Schématique" +#: eeschema/libframe.cpp:698 +msgid "Add rectangle" +msgstr "Ajout de rectangle" + +#: eeschema/libframe.cpp:702 +msgid "Add circle" +msgstr "Ajout de cercle" + +#: eeschema/libframe.cpp:706 +msgid "Add arc" +msgstr "Ajout d'arc" + +#: eeschema/libframe.cpp:710 +msgid "Add line" +msgstr "Addition de lignes" + +#: eeschema/libframe.cpp:714 +msgid "Set anchor position" +msgstr "Ajuster Position Ancre" + +#: eeschema/libframe.cpp:724 +msgid "Export" +msgstr "Exporter" + +#: eeschema/getpart.cpp:96 +#, c-format +msgid "component selection (%d items loaded):" +msgstr "Sélection Composant (%d items chargés):" + +#: eeschema/getpart.cpp:187 +msgid "Failed to find part " +msgstr "Impossible de trouver le composant " + +#: eeschema/getpart.cpp:187 +msgid " in library" +msgstr " en librairie" #: eeschema/netlist.cpp:88 msgid "List" @@ -6878,14 +6975,6 @@ msgstr "Valeurs différentes pour %s%d%c (%s) et %s%d%c (%s)" msgid "duplicate time stamp (%s) for %s%d and %s%d" msgstr "signature temporelle dupliquée (%s) pour %s%d et %s%d" -#: eeschema/hotkeys.cpp:307 -msgid "Add Component" -msgstr "Ajout Composant" - -#: eeschema/hotkeys.cpp:331 -msgid "Add Wire" -msgstr "Ajouter Fils" - #: eeschema/libedit.cpp:25 msgid "Component Library Editor: " msgstr "Editeur de Composants: " @@ -7039,85 +7128,294 @@ msgstr "Le composant \" %s\" existe, Le changer ?" msgid "Component %s saved in library %s" msgstr "Composant %s sauvé en librairie %s" -#: eeschema/pinedit.cpp:202 -msgid "This position is already occupied by another pin. Continue?" -msgstr "Position occupée par une autre pin. Continuer ?" +#: eeschema/menubar.cpp:43 +msgid "New schematic project" +msgstr "Nouveau Projet schématique" -#: eeschema/pinedit.cpp:627 -msgid "No pins!" -msgstr "Pas de Pins!" +#: eeschema/menubar.cpp:48 +msgid "Open an existing schematic project" +msgstr "Ouvrir un projet schématique existant" -#: eeschema/pinedit.cpp:638 -msgid "Marker Information" -msgstr "Info Marqueur" +#: eeschema/menubar.cpp:57 +msgid "Open a recent opened schematic project" +msgstr "Ouvrir un projet schématique récemment ouvert" -#: eeschema/pinedit.cpp:657 -#, c-format -msgid "Duplicate pin %s \"%s\" at location (%.3f, %.3f) conflicts with pin %s \"%s\" at location (%.3f, %.3f)" -msgstr "Pin dupliquée %s \"%s\" en position (%.3f, %.3f) en conflit avec pin %s \"%s\" en position (%.3f, %.3f)" +#: eeschema/menubar.cpp:63 +msgid "&Save Whole Schematic Project" +msgstr "SauverTout le Projet Schématique" -#: eeschema/pinedit.cpp:670 -#: eeschema/pinedit.cpp:709 -#, c-format -msgid " in part %c" -msgstr " en composant %c" +#: eeschema/menubar.cpp:64 +msgid "Save all sheets in the schematic project" +msgstr "Sauver toutes les feuilles du projet schématique" -#: eeschema/pinedit.cpp:677 -#: eeschema/pinedit.cpp:716 -msgid " of converted" -msgstr " de converti" +#: eeschema/menubar.cpp:69 +msgid "&Save Current Sheet Only" +msgstr "Sauver la Feuille &Courante:" -#: eeschema/pinedit.cpp:679 -#: eeschema/pinedit.cpp:718 -msgid " of normal" -msgstr " de normal" +#: eeschema/menubar.cpp:70 +msgid "Save only current schematic sheet" +msgstr "Sauver seulement la feuille active" -#: eeschema/pinedit.cpp:700 -#, c-format -msgid "Off grid pin %s \"%s\" at location (%.3f, %.3f)" -msgstr "Pin %s hors grille \"%s\" en position (%.3f, %.3f)" +#: eeschema/menubar.cpp:75 +msgid "Save Current Sheet &as..." +msgstr "Sauver la Feuille Courante sous ..." -#: eeschema/pinedit.cpp:727 -msgid "No off grid or duplicate pins were found." -msgstr "Pas de pins doublées ou hors grille trouvées" +#: eeschema/menubar.cpp:76 +msgid "Save current schematic sheet as..." +msgstr "Sauver la feuille active sous ..." -#: eeschema/getpart.cpp:96 -#, c-format -msgid "component selection (%d items loaded):" -msgstr "Sélection Composant (%d items chargés):" +#: eeschema/menubar.cpp:84 +msgid "Print schematic sheet" +msgstr "Impression des feuilles de schéma" -#: eeschema/getpart.cpp:187 -msgid "Failed to find part " -msgstr "Impossible de trouver le composant " +#: eeschema/menubar.cpp:91 +msgid "Plot PostScript" +msgstr "Tracé Postscript" -#: eeschema/getpart.cpp:187 -msgid " in library" -msgstr " en librairie" +#: eeschema/menubar.cpp:92 +msgid "Plot schematic sheet in PostScript format" +msgstr "Tracer les feuilles schématiques en format Postscript" + +#: eeschema/menubar.cpp:96 +msgid "Plot HPGL" +msgstr "Tracé HPGL" + +#: eeschema/menubar.cpp:97 +msgid "Plot schematic sheet in HPGL format" +msgstr "Tracer les feuilles schématiques en format HPGL" + +#: eeschema/menubar.cpp:101 +msgid "Plot SVG" +msgstr "Tracé SVG" + +#: eeschema/menubar.cpp:102 +msgid "Plot schematic sheet in SVG format" +msgstr "Tracer les feuilles schématiques en format SVG" + +#: eeschema/menubar.cpp:106 +msgid "Plot DXF" +msgstr "Tracé DXF" + +#: eeschema/menubar.cpp:107 +msgid "Plot schematic sheet in DXF format" +msgstr "Tracer les feuilles schématiques en format DXF" + +#: eeschema/menubar.cpp:115 +msgid "Plot to Clipboard" +msgstr "Tracé dans Presse papier" + +#: eeschema/menubar.cpp:116 +msgid "Export drawings to clipboard" +msgstr " Exporter le dessin dans le presse-papier" + +#: eeschema/menubar.cpp:123 +msgid "Plot schematic sheet in HPGL, PostScript or SVG format" +msgstr "Tracer les feuilles schématiques en format HPGL, POSTSCRIPT ou SVG" + +#: eeschema/menubar.cpp:126 +msgid "E&xit" +msgstr "&Quitter" + +#: eeschema/menubar.cpp:127 +msgid "Quit Eeschema" +msgstr "Quitter Eeschema" + +#: eeschema/menubar.cpp:135 +msgid "&Undo\t" +msgstr "&Undo\t" + +#: eeschema/menubar.cpp:141 +msgid "&Redo\t" +msgstr "&Redo\t" + +#: eeschema/menubar.cpp:156 +msgid "Find" +msgstr "Chercher" + +#: eeschema/menubar.cpp:163 +msgid "Backannotate" +msgstr "Rétro Annotation" + +#: eeschema/menubar.cpp:164 +msgid "Back annotated footprint fields" +msgstr "Rétroannotation des champs modules" + +#: eeschema/menubar.cpp:204 +msgid "&Component" +msgstr "&Composant" + +#: eeschema/menubar.cpp:205 +msgid "Place the component" +msgstr "Placer le Composant" + +#: eeschema/menubar.cpp:209 +msgid "&Power port" +msgstr "Power Symbole" + +#: eeschema/menubar.cpp:210 +msgid "Place the power port" +msgstr "Placer le Symbole Power" + +#: eeschema/menubar.cpp:214 +msgid "&Wire" +msgstr "&Fil" + +#: eeschema/menubar.cpp:215 +msgid "Place the wire" +msgstr "Place fil" + +#: eeschema/menubar.cpp:219 +msgid "&Bus" +msgstr "&Bus" + +#: eeschema/menubar.cpp:220 +msgid "Place bus" +msgstr "Place bus" + +#: eeschema/menubar.cpp:225 +msgid "W&ire to bus entry" +msgstr "Entrées de bus (type fil vers bus)" + +#: eeschema/menubar.cpp:226 +msgid "Place a wire to bus entry" +msgstr "Placer une Entrée de Bus (type fil vers bus)" + +#: eeschema/menubar.cpp:231 +msgid "B&us to bus entry" +msgstr "Entrées de bus (type bus vers bus)" + +#: eeschema/menubar.cpp:232 +msgid "Place a bus to bus entry" +msgstr "Placer une Entrée de Bus (type bus vers bus)" + +#: eeschema/menubar.cpp:236 +msgid "No connect flag" +msgstr "Symbole de Non Connexion" + +#: eeschema/menubar.cpp:237 +msgid "Place a no connect flag" +msgstr "Placer un Symbole de Non Connexion" + +#: eeschema/menubar.cpp:241 +msgid "Net name" +msgstr "Net Name" + +#: eeschema/menubar.cpp:242 +msgid "Place net name" +msgstr "Place nom de net" + +#: eeschema/menubar.cpp:246 +msgid "Global label" +msgstr "Label Global" + +#: eeschema/menubar.cpp:247 +msgid "Place a global label. Warning: all global labels with the same name are connected in whole hierarchy" +msgstr "Placer un label global. Attention: tous les labels globaux avec le même nom sont connectés dans toute la hiérarchie" + +#: eeschema/menubar.cpp:252 +msgid "Junction" +msgstr "Jonction" + +#: eeschema/menubar.cpp:253 +msgid "Place junction" +msgstr "Place jonction" + +#: eeschema/menubar.cpp:260 +msgid "Hierarchical label" +msgstr "Label Hiérarchique" + +#: eeschema/menubar.cpp:261 +msgid "Place a hierarchical label. This label will be seen as a pin sheet in the sheet symbol" +msgstr "Placer un label hiérachique. Ce label sera vu comme une pin dans la feuille mère symbole" + +#: eeschema/menubar.cpp:267 +msgid "Hierarchical sheet" +msgstr "Feuille Hiérrachique" + +#: eeschema/menubar.cpp:268 +msgid "Create a hierarchical sheet" +msgstr "Créer une Feuille Hiérachique" + +#: eeschema/menubar.cpp:273 +msgid "Import Hierarchical Label" +msgstr "Importer Label Hiérarchique" + +#: eeschema/menubar.cpp:274 +msgid "Place a pin sheet created by importing a hierarchical label from sheet" +msgstr "Placer une pin hiérarchique créée par importation d'un label hiérarchique de la feuille" + +#: eeschema/menubar.cpp:280 +msgid "Add Hierarchical Pin to Sheet" +msgstr "Ajouter Pins de Hiérarchie dans feuille" + +#: eeschema/menubar.cpp:281 +msgid "Place a hierarchical pin to sheet" +msgstr "Addition de pins de hiérarchie dans les feuilles symboles de hiérarchie" + +#: eeschema/menubar.cpp:289 +msgid "Graphic line or polygon" +msgstr "Ligne ou polygone graphique" + +#: eeschema/menubar.cpp:290 +msgid "Place graphic lines or polygons" +msgstr "Placer lignes ou polygones graphiques" + +#: eeschema/menubar.cpp:296 +msgid "Graphic text (comment)" +msgstr "Textes graphiques (commentaires)" + +#: eeschema/menubar.cpp:297 +msgid "Place graphic text (comment)" +msgstr "Placer textes graphiques (commentaires)" + +#: eeschema/menubar.cpp:305 +msgid "Library preferences" +msgstr "Préférences pour Librairie" + +#: eeschema/menubar.cpp:309 +msgid "&Colors" +msgstr "&Couleurs" + +#: eeschema/menubar.cpp:310 +msgid "Color preferences" +msgstr "Préférences de couleurs" + +#: eeschema/menubar.cpp:315 +msgid "&Options" +msgstr "&Options" + +#: eeschema/menubar.cpp:316 +msgid "Eeschema general options and preferences" +msgstr "Options et préférences générales de Eeschema" + +#: eeschema/menubar.cpp:325 +msgid "&Save preferences" +msgstr "&Sauver Préférences" + +#: eeschema/menubar.cpp:330 +msgid "&Read preferences" +msgstr "&Lire Préférences" + +#: eeschema/menubar.cpp:338 +msgid "Open the eeschema manual" +msgstr "Ouvrir la documentation de eeschema" + +#: eeschema/menubar.cpp:343 +msgid "About eeschema schematic designer" +msgstr "Au sujet de Eeschema (outil de conception schématique)" + +#: eeschema/menubar.cpp:351 +msgid "&Place" +msgstr "&Placer" #: eeschema/tool_lib.cpp:38 msgid "Deselect current tool" msgstr "Désélection outil courant" -#: eeschema/tool_lib.cpp:43 -msgid "Add pin" -msgstr "Addition de \"pins\"" - #: eeschema/tool_lib.cpp:47 msgid "Add graphic text" msgstr "Addition de textes graphiques (commentaires)" -#: eeschema/tool_lib.cpp:51 -msgid "Add rectangle" -msgstr "Ajout de rectangle" - -#: eeschema/tool_lib.cpp:55 -msgid "Add circle" -msgstr "Ajout de cercle" - -#: eeschema/tool_lib.cpp:59 -msgid "Add arc" -msgstr "Ajout d'arc" - #: eeschema/tool_lib.cpp:63 msgid "Add lines and polygons" msgstr "Addition de lignes ou polygones graphiques" @@ -7240,9 +7538,47 @@ msgstr "" "Changer le nom de fichier peut changer toute la structure schématique et ne pourra être annulée.\n" "Ok pour renommer?" -#: eeschema/eeschema.cpp:113 -msgid "Eeschema is already running, Continue?" -msgstr "Eeschema est en cours d'exécution. Continuer ?" +#: eeschema/pinedit.cpp:234 +msgid "This position is already occupied by another pin. Continue?" +msgstr "Position occupée par une autre pin. Continuer ?" + +#: eeschema/pinedit.cpp:659 +msgid "No pins!" +msgstr "Pas de Pins!" + +#: eeschema/pinedit.cpp:670 +msgid "Marker Information" +msgstr "Info Marqueur" + +#: eeschema/pinedit.cpp:689 +#, c-format +msgid "Duplicate pin %s \"%s\" at location (%.3f, %.3f) conflicts with pin %s \"%s\" at location (%.3f, %.3f)" +msgstr "Pin dupliquée %s \"%s\" en position (%.3f, %.3f) en conflit avec pin %s \"%s\" en position (%.3f, %.3f)" + +#: eeschema/pinedit.cpp:702 +#: eeschema/pinedit.cpp:741 +#, c-format +msgid " in part %c" +msgstr " en composant %c" + +#: eeschema/pinedit.cpp:709 +#: eeschema/pinedit.cpp:748 +msgid " of converted" +msgstr " de converti" + +#: eeschema/pinedit.cpp:711 +#: eeschema/pinedit.cpp:750 +msgid " of normal" +msgstr " de normal" + +#: eeschema/pinedit.cpp:732 +#, c-format +msgid "Off grid pin %s \"%s\" at location (%.3f, %.3f)" +msgstr "Pin %s hors grille \"%s\" en position (%.3f, %.3f)" + +#: eeschema/pinedit.cpp:759 +msgid "No off grid or duplicate pins were found." +msgstr "Pas de pins doublées ou hors grille trouvées" #: eeschema/sheetlab.cpp:61 msgid "PinSheet Properties:" @@ -7379,43 +7715,13 @@ msgstr "critère de recherche par clé <" msgid "Select Component" msgstr "Sélection Composant" -#: eeschema/libframe.cpp:290 -msgid "" -"Component was modified!\n" -"Discard changes?" -msgstr "" -"Le composant a été modifié\n" -"Perdre les changements" +#: eeschema/hotkeys.cpp:309 +msgid "Add Component" +msgstr "Ajout Composant" -#: eeschema/libframe.cpp:303 -#, c-format -msgid "" -"Library \"%s\" was modified!\n" -"Discard changes?" -msgstr "" -"Librairie \"%s\" modifiée!\n" -"Perdre les changements ?" - -#: eeschema/libframe.cpp:413 -#, c-format -msgid "Part %c" -msgstr "Composant %c" - -#: eeschema/libframe.cpp:679 -msgid "Set pin options" -msgstr "Choix options de pin" - -#: eeschema/libframe.cpp:708 -msgid "Add line" -msgstr "Addition de lignes" - -#: eeschema/libframe.cpp:712 -msgid "Set anchor position" -msgstr "Ajuster Position Ancre" - -#: eeschema/libframe.cpp:722 -msgid "Export" -msgstr "Exporter" +#: eeschema/hotkeys.cpp:333 +msgid "Add Wire" +msgstr "Ajouter Fils" #: eeschema/libarch.cpp:55 #, c-format @@ -7505,7 +7811,7 @@ msgstr "Impossible de créer le fichier <%s>" msgid "Saving symbol in [%s]" msgstr "Symbole sauvé en [%s]" -#: eeschema/symbdraw.cpp:632 +#: eeschema/symbdraw.cpp:635 #, c-format msgid "Arc %.1f deg" msgstr "Arc %.1f deg" @@ -7619,304 +7925,6 @@ msgstr "" "\n" " >> Erreurs ERC: %d\n" -#: eeschema/menubar.cpp:42 -msgid "&New" -msgstr "&Nouveau" - -#: eeschema/menubar.cpp:43 -#: eeschema/tool_sch.cpp:34 -msgid "New schematic project" -msgstr "Nouveau Projet schématique" - -#: eeschema/menubar.cpp:47 -msgid "&Open" -msgstr "&Ouvrir " - -#: eeschema/menubar.cpp:48 -msgid "Open an existing schematic project" -msgstr "Ouvrir un projet schématique existant" - -#: eeschema/menubar.cpp:53 -msgid "&Save Project" -msgstr "&Sauver Projet" - -#: eeschema/menubar.cpp:54 -msgid "Save all sheets in the schematic project" -msgstr "Sauver toutes les feuilles du projet schématique" - -#: eeschema/menubar.cpp:59 -msgid "&Save" -msgstr "&Sauver" - -#: eeschema/menubar.cpp:60 -msgid "Save only current schematic sheet" -msgstr "Sauver seulement la feuille active" - -#: eeschema/menubar.cpp:64 -msgid "Save &as..." -msgstr "S&auver Sous..." - -#: eeschema/menubar.cpp:65 -msgid "Save current schematic sheet as..." -msgstr "Sauver la feuille active sous ..." - -#: eeschema/menubar.cpp:72 -msgid "Print schematic sheet" -msgstr "Impression des feuilles de schéma" - -#: eeschema/menubar.cpp:79 -msgid "Plot PostScript" -msgstr "Tracé Postscript" - -#: eeschema/menubar.cpp:80 -msgid "Plot schematic sheet in PostScript format" -msgstr "Tracer les feuilles schématiques en format Postscript" - -#: eeschema/menubar.cpp:84 -msgid "Plot HPGL" -msgstr "Tracé HPGL" - -#: eeschema/menubar.cpp:85 -msgid "Plot schematic sheet in HPGL format" -msgstr "Tracer les feuilles schématiques en format HPGL" - -#: eeschema/menubar.cpp:89 -msgid "Plot SVG" -msgstr "Tracé SVG" - -#: eeschema/menubar.cpp:90 -msgid "Plot schematic sheet in SVG format" -msgstr "Tracer les feuilles schématiques en format SVG" - -#: eeschema/menubar.cpp:94 -msgid "Plot DXF" -msgstr "Tracé DXF" - -#: eeschema/menubar.cpp:95 -msgid "Plot schematic sheet in DXF format" -msgstr "Tracer les feuilles schématiques en format DXF" - -#: eeschema/menubar.cpp:103 -msgid "Plot to Clipboard" -msgstr "Tracé dans Presse papier" - -#: eeschema/menubar.cpp:104 -msgid "Export drawings to clipboard" -msgstr " Exporter le dessin dans le presse-papier" - -#: eeschema/menubar.cpp:111 -msgid "Plot schematic sheet in HPGL, PostScript or SVG format" -msgstr "Tracer les feuilles schématiques en format HPGL, POSTSCRIPT ou SVG" - -#: eeschema/menubar.cpp:115 -msgid "Quit Eeschema" -msgstr "Quitter Eeschema" - -#: eeschema/menubar.cpp:124 -msgid "&Undo\t" -msgstr "&Undo\t" - -#: eeschema/menubar.cpp:130 -msgid "&Redo\t" -msgstr "&Redo\t" - -#: eeschema/menubar.cpp:145 -msgid "Find" -msgstr "Chercher" - -#: eeschema/menubar.cpp:152 -msgid "Backannotate" -msgstr "Rétro Annotation" - -#: eeschema/menubar.cpp:153 -msgid "Back annotated footprint fields" -msgstr "Rétroannotation des champs modules" - -#: eeschema/menubar.cpp:193 -msgid "&Component" -msgstr "&Composant" - -#: eeschema/menubar.cpp:194 -msgid "Place the component" -msgstr "Placer le Composant" - -#: eeschema/menubar.cpp:198 -msgid "&Power port" -msgstr "Power Symbole" - -#: eeschema/menubar.cpp:199 -msgid "Place the power port" -msgstr "Placer le Symbole Power" - -#: eeschema/menubar.cpp:203 -msgid "&Wire" -msgstr "&Fil" - -#: eeschema/menubar.cpp:204 -msgid "Place the wire" -msgstr "Place fil" - -#: eeschema/menubar.cpp:208 -msgid "&Bus" -msgstr "&Bus" - -#: eeschema/menubar.cpp:209 -msgid "Place bus" -msgstr "Place bus" - -#: eeschema/menubar.cpp:214 -msgid "W&ire to bus entry" -msgstr "Entrées de bus (type fil vers bus)" - -#: eeschema/menubar.cpp:215 -#: eeschema/tool_sch.cpp:179 -msgid "Place a wire to bus entry" -msgstr "Placer une Entrée de Bus (type fil vers bus)" - -#: eeschema/menubar.cpp:220 -msgid "B&us to bus entry" -msgstr "Entrées de bus (type bus vers bus)" - -#: eeschema/menubar.cpp:221 -#: eeschema/tool_sch.cpp:183 -msgid "Place a bus to bus entry" -msgstr "Placer une Entrée de Bus (type bus vers bus)" - -#: eeschema/menubar.cpp:225 -msgid "No connect flag" -msgstr "Symbole de Non Connexion" - -#: eeschema/menubar.cpp:226 -msgid "Place a no connect flag" -msgstr "Placer un Symbole de Non Connexion" - -#: eeschema/menubar.cpp:230 -msgid "Net name" -msgstr "Net Name" - -#: eeschema/menubar.cpp:231 -#: eeschema/tool_sch.cpp:192 -msgid "Place net name" -msgstr "Place nom de net" - -#: eeschema/menubar.cpp:235 -msgid "Global label" -msgstr "Label Global" - -#: eeschema/menubar.cpp:236 -msgid "Place a global label. Warning: all global labels with the same name are connected in whole hierarchy" -msgstr "Placer un label global. Attention: tous les labels globaux avec le même nom sont connectés dans toute la hiérarchie" - -#: eeschema/menubar.cpp:241 -msgid "Junction" -msgstr "Jonction" - -#: eeschema/menubar.cpp:242 -msgid "Place junction" -msgstr "Place jonction" - -#: eeschema/menubar.cpp:249 -msgid "Hierarchical label" -msgstr "Label Hiérarchique" - -#: eeschema/menubar.cpp:250 -#: eeschema/tool_sch.cpp:206 -msgid "Place a hierarchical label. This label will be seen as a pin sheet in the sheet symbol" -msgstr "Placer un label hiérachique. Ce label sera vu comme une pin dans la feuille mère symbole" - -#: eeschema/menubar.cpp:256 -msgid "Hierarchical sheet" -msgstr "Feuille Hiérrachique" - -#: eeschema/menubar.cpp:257 -msgid "Create a hierarchical sheet" -msgstr "Créer une Feuille Hiérachique" - -#: eeschema/menubar.cpp:262 -msgid "Import Hierarchical Label" -msgstr "Importer Label Hiérarchique" - -#: eeschema/menubar.cpp:263 -msgid "Place a pin sheet created by importing a hierarchical label from sheet" -msgstr "Placer une pin hiérarchique créée par importation d'un label hiérarchique de la feuille" - -#: eeschema/menubar.cpp:269 -msgid "Add Hierarchical Pin to Sheet" -msgstr "Ajouter Pins de Hiérarchie dans feuille" - -#: eeschema/menubar.cpp:270 -msgid "Place a hierarchical pin to sheet" -msgstr "Addition de pins de hiérarchie dans les feuilles symboles de hiérarchie" - -#: eeschema/menubar.cpp:278 -msgid "Graphic line or polygon" -msgstr "Ligne ou polygone graphique" - -#: eeschema/menubar.cpp:279 -msgid "Place graphic lines or polygons" -msgstr "Placer lignes ou polygones graphiques" - -#: eeschema/menubar.cpp:285 -msgid "Graphic text (comment)" -msgstr "Textes graphiques (commentaires)" - -#: eeschema/menubar.cpp:286 -#: eeschema/tool_sch.cpp:229 -msgid "Place graphic text (comment)" -msgstr "Placer textes graphiques (commentaires)" - -#: eeschema/menubar.cpp:294 -msgid "Library preferences" -msgstr "Préférences pour Librairie" - -#: eeschema/menubar.cpp:298 -msgid "&Colors" -msgstr "&Couleurs" - -#: eeschema/menubar.cpp:299 -msgid "Color preferences" -msgstr "Préférences de couleurs" - -#: eeschema/menubar.cpp:304 -msgid "&Options" -msgstr "&Options" - -#: eeschema/menubar.cpp:305 -msgid "Eeschema general options and preferences" -msgstr "Options et préférences générales de Eeschema" - -#: eeschema/menubar.cpp:314 -msgid "&Save preferences" -msgstr "&Sauver Préférences" - -#: eeschema/menubar.cpp:319 -msgid "&Read preferences" -msgstr "&Lire Préférences" - -#: eeschema/menubar.cpp:327 -msgid "Open the eeschema manual" -msgstr "Ouvrir la documentation de eeschema" - -#: eeschema/menubar.cpp:331 -msgid "&About" -msgstr "&Au Sujet de" - -#: eeschema/menubar.cpp:332 -msgid "About eeschema schematic designer" -msgstr "Au sujet de Eeschema (outil de conception schématique)" - -#: eeschema/menubar.cpp:338 -msgid "&Edit" -msgstr "&Editer" - -#: eeschema/menubar.cpp:339 -msgid "&View" -msgstr "&Voir" - -#: eeschema/menubar.cpp:340 -msgid "&Place" -msgstr "&Placer" - #: eeschema/backanno.cpp:141 msgid "Load Stuff File" msgstr "Charger Fichier d'échange" @@ -8548,6 +8556,11 @@ msgstr "Placer ligne ou polygone graphique" msgid "Turn grid off" msgstr "Ne pas afficher la grille" +#: eeschema/tool_sch.cpp:270 +#: eeschema/schframe.cpp:497 +msgid "Show hidden pins" +msgstr "Force affichage des pins invisibles" + #: eeschema/tool_sch.cpp:275 msgid "HV orientation for wires and bus" msgstr "Force direction H, V pour les fils et bus" @@ -8560,6 +8573,10 @@ msgstr "Pin " msgid "Ref " msgstr "Ref " +#: eeschema/find.cpp:218 +msgid "Value " +msgstr "Valeur " + #: eeschema/find.cpp:222 msgid "Field " msgstr "Champ " @@ -8713,57 +8730,25 @@ msgstr "la position X du point %d de la courbe de Bezier n'est pas définie" msgid "Bezier point %d Y position not defined" msgstr "la position Y du point %d de la courbe de Bezier n'est pas définie" -#: eeschema/schedit.cpp:173 -msgid "Push/Pop Hierarchy" -msgstr "Naviger dans Hiérarchie" +#: eeschema/schframe.cpp:350 +msgid "Schematic modified, Save before exit ?" +msgstr "Schématique modifiée, Sauver avant de quitter ?" -#: eeschema/schedit.cpp:177 -msgid "Add NoConnect Flag" -msgstr "Ajoutde symboles de non connexion" +#: eeschema/schframe.cpp:485 +msgid "Draw wires and buses in any direction" +msgstr "Tracer les fils et bus avec direction quelconque" -#: eeschema/schedit.cpp:185 -msgid "Add Bus" -msgstr "Addition de Bus" +#: eeschema/schframe.cpp:486 +msgid "Draw horizontal and vertical wires and buses only" +msgstr "Autoriser fils et bus verticaux et horizontaux seulement" -#: eeschema/schedit.cpp:193 -msgid "Add Junction" -msgstr "Ajout jonctions" +#: eeschema/schframe.cpp:496 +msgid "Do not show hidden pins" +msgstr "Ne pas affichager les pins invisibles" -#: eeschema/schedit.cpp:197 -msgid "Add Label" -msgstr "Ajout Label" - -#: eeschema/schedit.cpp:201 -msgid "Add Global label" -msgstr "Ajout de labels globaux" - -#: eeschema/schedit.cpp:205 -msgid "Add Hierarchal label" -msgstr "Ajouter Label Hiérarchique" - -#: eeschema/schedit.cpp:213 -msgid "Add Wire to Bus entry" -msgstr "Addition d'entrées de bus (type fil vers bus)" - -#: eeschema/schedit.cpp:217 -msgid "Add Bus to Bus entry" -msgstr "Addition d'entrées de bus (type bus vers bus)" - -#: eeschema/schedit.cpp:221 -msgid "Add Sheet" -msgstr "Ajout de Feuille" - -#: eeschema/schedit.cpp:225 -msgid "Add PinSheet" -msgstr "Ajout Conn. hiérar." - -#: eeschema/schedit.cpp:229 -msgid "Import PinSheet" -msgstr "Importer Connecteur de hiérarchie" - -#: eeschema/schedit.cpp:237 -msgid "Add Power" -msgstr "Ajouter Alims" +#: eeschema/schframe.cpp:588 +msgid "Schematic" +msgstr "Schématique" #: eeschema/files-io.cpp:71 msgid "Clear schematic hierarchy?" @@ -8875,6 +8860,10 @@ msgstr "Nom feuille" msgid "File name" msgstr "Nom fichier" +#: eeschema/eeschema.cpp:131 +msgid "Eeschema is already running, Continue?" +msgstr "Eeschema est en cours d'exécution. Continuer ?" + #: eeschema/dialog_edit_label_base.cpp:24 #: eeschema/dialog_edit_label_base.cpp:29 msgid "Enter the text to be used within the schematic" @@ -9011,432 +9000,57 @@ msgstr "Nom de pin à l'&intérieur" msgid "%8.8lX/" msgstr "%8.8lX/" -#: eeschema/onrightclick.cpp:104 -msgid "Leave Sheet" -msgstr "Quitter sous-feuille" +#: eeschema/schedit.cpp:173 +msgid "Push/Pop Hierarchy" +msgstr "Naviger dans Hiérarchie" -#: eeschema/onrightclick.cpp:119 -msgid "Delete Noconn" -msgstr "Supprimer Non Connexion" +#: eeschema/schedit.cpp:177 +msgid "Add NoConnect Flag" +msgstr "Ajoutde symboles de non connexion" -#: eeschema/onrightclick.cpp:130 -msgid "Move Bus Entry" -msgstr "Déplacer Entrée de Bus" +#: eeschema/schedit.cpp:185 +msgid "Add Bus" +msgstr "Addition de Bus" -#: eeschema/onrightclick.cpp:133 -msgid "Set Bus Entry /" -msgstr "Entrée de Bus /" +#: eeschema/schedit.cpp:193 +msgid "Add Junction" +msgstr "Ajout jonctions" -#: eeschema/onrightclick.cpp:136 -msgid "Set Bus Entry \\" -msgstr "Entrée de Bus \\" +#: eeschema/schedit.cpp:197 +msgid "Add Label" +msgstr "Ajout Label" -#: eeschema/onrightclick.cpp:138 -msgid "Delete Bus Entry" -msgstr "Supprimer Entrée de Bus" +#: eeschema/schedit.cpp:201 +msgid "Add Global label" +msgstr "Ajout de labels globaux" -#: eeschema/onrightclick.cpp:234 -msgid "Move Field" -msgstr "Déplace Champ" +#: eeschema/schedit.cpp:205 +msgid "Add Hierarchal label" +msgstr "Ajouter Label Hiérarchique" -#: eeschema/onrightclick.cpp:236 -msgid "Rotate Field" -msgstr "Rotation Champ" +#: eeschema/schedit.cpp:213 +msgid "Add Wire to Bus entry" +msgstr "Addition d'entrées de bus (type fil vers bus)" -#: eeschema/onrightclick.cpp:238 -msgid "Edit Field" -msgstr "Editer Champ" +#: eeschema/schedit.cpp:217 +msgid "Add Bus to Bus entry" +msgstr "Addition d'entrées de bus (type bus vers bus)" -#: eeschema/onrightclick.cpp:266 -msgid "Move Component" -msgstr "Déplace Composant" +#: eeschema/schedit.cpp:221 +msgid "Add Sheet" +msgstr "Ajout de Feuille" -#: eeschema/onrightclick.cpp:271 -msgid "Drag Component" -msgstr "Drag Composant" +#: eeschema/schedit.cpp:225 +msgid "Add PinSheet" +msgstr "Ajout Conn. hiérar." -#: eeschema/onrightclick.cpp:284 -msgid "Mirror --" -msgstr "Miroir--" +#: eeschema/schedit.cpp:229 +msgid "Import PinSheet" +msgstr "Importer Connecteur de hiérarchie" -#: eeschema/onrightclick.cpp:287 -msgid "Mirror ||" -msgstr "Miroir ||" - -#: eeschema/onrightclick.cpp:295 -msgid "Orient Component" -msgstr "Oriente Composant" - -#: eeschema/onrightclick.cpp:313 -msgid "Footprint " -msgstr "Empreinte: " - -#: eeschema/onrightclick.cpp:329 -#, c-format -msgid "Unit %d %c" -msgstr "Unité %d %c" - -#: eeschema/onrightclick.cpp:341 -msgid "Edit Component" -msgstr "Edite Composant" - -#: eeschema/onrightclick.cpp:345 -msgid "Copy Component" -msgstr "Copie Composant" - -#: eeschema/onrightclick.cpp:369 -msgid "Move Global Label" -msgstr "Déplacer Label Global" - -#: eeschema/onrightclick.cpp:373 -msgid "Copy Global Label" -msgstr "Copier Label Global" - -#: eeschema/onrightclick.cpp:379 -msgid "Rotate Global Label" -msgstr "Rot. Label Global" - -#: eeschema/onrightclick.cpp:383 -msgid "Edit Global Label" -msgstr "Editer Label Global" - -#: eeschema/onrightclick.cpp:387 -msgid "Delete Global Label" -msgstr "Supprimer Label Global" - -#: eeschema/onrightclick.cpp:394 -#: eeschema/onrightclick.cpp:481 -#: eeschema/onrightclick.cpp:532 -msgid "Change to Hierarchical Label" -msgstr "Changer en Label Hiérarchique" - -#: eeschema/onrightclick.cpp:396 -#: eeschema/onrightclick.cpp:438 -#: eeschema/onrightclick.cpp:529 -msgid "Change to Label" -msgstr "Change en Label" - -#: eeschema/onrightclick.cpp:398 -#: eeschema/onrightclick.cpp:440 -#: eeschema/onrightclick.cpp:483 -msgid "Change to Text" -msgstr "Change en Texte" - -#: eeschema/onrightclick.cpp:401 -#: eeschema/onrightclick.cpp:445 -#: eeschema/onrightclick.cpp:488 -#: eeschema/onrightclick.cpp:539 -msgid "Change Type" -msgstr "Change Type" - -#: eeschema/onrightclick.cpp:412 -msgid "Move Hierarchical Label" -msgstr "Déplacer Label Hiérarchique" - -#: eeschema/onrightclick.cpp:417 -msgid "Copy Hierarchical Label" -msgstr "Copier Label Hiérarchique" - -#: eeschema/onrightclick.cpp:423 -#: eeschema/onrightclick.cpp:426 -msgid "Rotate Hierarchical Label" -msgstr "Rot. Label Hiérarchique" - -#: eeschema/onrightclick.cpp:427 -#: eeschema/onrightclick.cpp:430 -msgid "Edit Hierarchical Label" -msgstr "Editer Label Hiérarchique" - -#: eeschema/onrightclick.cpp:431 -msgid "Delete Hierarchical Label" -msgstr "Supprimer Label Hiérarchique" - -#: eeschema/onrightclick.cpp:442 -#: eeschema/onrightclick.cpp:485 -msgid "Change to Global Label" -msgstr "Change en Label Global" - -#: eeschema/onrightclick.cpp:456 -msgid "Move Label" -msgstr "Déplace Label" - -#: eeschema/onrightclick.cpp:460 -msgid "Copy Label" -msgstr "Copier Label" - -#: eeschema/onrightclick.cpp:466 -msgid "Rotate Label" -msgstr "Rot. Label" - -#: eeschema/onrightclick.cpp:470 -msgid "Edit Label" -msgstr "Editer Label" - -#: eeschema/onrightclick.cpp:474 -msgid "Delete Label" -msgstr "Supprimer Label" - -#: eeschema/onrightclick.cpp:499 -msgid "Move Text" -msgstr "Déplacer Texte" - -#: eeschema/onrightclick.cpp:504 -msgid "Copy Text" -msgstr "CopierTexte" - -#: eeschema/onrightclick.cpp:510 -#: eeschema/libedit_onrightclick.cpp:148 -msgid "Rotate Text" -msgstr "Rot. Texte" - -#: eeschema/onrightclick.cpp:514 -msgid "Edit Text" -msgstr "Editer Texte" - -#: eeschema/onrightclick.cpp:518 -msgid "Delete Text" -msgstr "Effacer Texte" - -#: eeschema/onrightclick.cpp:536 -msgid "Change to Glabel" -msgstr "Change en Label Global" - -#: eeschema/onrightclick.cpp:555 -#: eeschema/onrightclick.cpp:600 -msgid "Break Wire" -msgstr "Briser Fil" - -#: eeschema/onrightclick.cpp:558 -msgid "Delete Junction" -msgstr "Supprimer Jonction" - -#: eeschema/onrightclick.cpp:567 -#: eeschema/onrightclick.cpp:593 -msgid "Delete Node" -msgstr "Supprimer Noeud" - -#: eeschema/onrightclick.cpp:569 -#: eeschema/onrightclick.cpp:596 -msgid "Delete Connection" -msgstr "Supprimer Connexion" - -#: eeschema/onrightclick.cpp:583 -msgid "Wire End" -msgstr "Terminer Fil" - -#: eeschema/onrightclick.cpp:587 -msgid "Drag Wire" -msgstr "Drag Fil" - -#: eeschema/onrightclick.cpp:590 -msgid "Delete Wire" -msgstr "Supprimer Fil" - -#: eeschema/onrightclick.cpp:614 -#: eeschema/onrightclick.cpp:646 -msgid "Add Global Label" -msgstr "Ajout Label Global" - -#: eeschema/onrightclick.cpp:626 -msgid "Bus End" -msgstr "Terminer Bus" - -#: eeschema/onrightclick.cpp:630 -msgid "Delete Bus" -msgstr "Supprimer Bus" - -#: eeschema/onrightclick.cpp:633 -msgid "Break Bus" -msgstr "Briser Bus" - -#: eeschema/onrightclick.cpp:655 -msgid "Enter Sheet" -msgstr "Entrer dans Feuille" - -#: eeschema/onrightclick.cpp:658 -msgid "Move Sheet" -msgstr "Déplacer Feuille" - -#: eeschema/onrightclick.cpp:663 -msgid "Place Sheet" -msgstr "Placer Feuille" - -#: eeschema/onrightclick.cpp:668 -msgid "Edit Sheet" -msgstr "Editer Feuille" - -#: eeschema/onrightclick.cpp:670 -msgid "Resize Sheet" -msgstr "Redimensionner Feuille" - -#: eeschema/onrightclick.cpp:673 -msgid "Import PinSheets" -msgstr "Importer Connecteur de Hiérarchie" - -#: eeschema/onrightclick.cpp:677 -msgid "Cleanup PinSheets" -msgstr "Nettoyage des Pins Hiérarchiques" - -#: eeschema/onrightclick.cpp:679 -msgid "Delete Sheet" -msgstr "Supprimer Feuille" - -#: eeschema/onrightclick.cpp:689 -msgid "Move PinSheet" -msgstr "Déplace Connecteur de hiérarchie" - -#: eeschema/onrightclick.cpp:691 -msgid "Edit PinSheet" -msgstr "Edit Connecteur de hiérarchie" - -#: eeschema/onrightclick.cpp:695 -msgid "Delete PinSheet" -msgstr "Supprimer Connecteur de hiérarchie" - -#: eeschema/onrightclick.cpp:708 -msgid "Window Zoom" -msgstr "Zoom sur Fenètre" - -#: eeschema/onrightclick.cpp:717 -msgid "Save Block" -msgstr "Sauver Bloc" - -#: eeschema/onrightclick.cpp:720 -msgid "Drag Block" -msgstr "Drag Bloc" - -#: eeschema/onrightclick.cpp:725 -#: eeschema/libedit_onrightclick.cpp:292 -msgid "Mirror Block ||" -msgstr "Miroir Bloc ||" - -#: eeschema/onrightclick.cpp:730 -msgid "Copy to Clipboard" -msgstr "Copie dans Presse papier" - -#: eeschema/libedit_onrightclick.cpp:83 -msgid "Move Arc " -msgstr "Déplacer arc" - -#: eeschema/libedit_onrightclick.cpp:89 -msgid "Arc Options" -msgstr "Options pour l'Arc" - -#: eeschema/libedit_onrightclick.cpp:92 -msgid "Delete Arc " -msgstr "Effacer Arc" - -#: eeschema/libedit_onrightclick.cpp:102 -msgid "Move Circle " -msgstr "Déplacer Cercle" - -#: eeschema/libedit_onrightclick.cpp:108 -msgid "Circle Options" -msgstr "Options pour le Cercle" - -#: eeschema/libedit_onrightclick.cpp:111 -msgid "Delete Circle " -msgstr "Supprimer Cercle" - -#: eeschema/libedit_onrightclick.cpp:121 -msgid "Move Rect " -msgstr "Déplacer Rect" - -#: eeschema/libedit_onrightclick.cpp:127 -msgid "Rect Options" -msgstr "Options pour le Rectangle" - -#: eeschema/libedit_onrightclick.cpp:130 -msgid "Delete Rect " -msgstr "Supprimer Rect" - -#: eeschema/libedit_onrightclick.cpp:140 -msgid "Move Text " -msgstr "Déplacer Texte" - -#: eeschema/libedit_onrightclick.cpp:146 -msgid "Text Editor" -msgstr "Editeur de Texte" - -#: eeschema/libedit_onrightclick.cpp:151 -msgid "Delete Text " -msgstr "Supprimer Texte" - -#: eeschema/libedit_onrightclick.cpp:161 -msgid "Move Line " -msgstr "Déplacer Ligne" - -#: eeschema/libedit_onrightclick.cpp:169 -msgid "Line End" -msgstr "Fin ligne" - -#: eeschema/libedit_onrightclick.cpp:172 -msgid "Line Options" -msgstr "Options pour Ligne" - -#: eeschema/libedit_onrightclick.cpp:175 -msgid "Delete Line " -msgstr "Efface Ligne" - -#: eeschema/libedit_onrightclick.cpp:184 -msgid "Delete Segment " -msgstr "Supprimer Segment" - -#: eeschema/libedit_onrightclick.cpp:196 -msgid "Move Field " -msgstr "Déplace Champ" - -#: eeschema/libedit_onrightclick.cpp:202 -msgid "Field Rotate" -msgstr "Rotation Champ" - -#: eeschema/libedit_onrightclick.cpp:204 -msgid "Field Edit" -msgstr "Edition du champ" - -#: eeschema/libedit_onrightclick.cpp:233 -msgid "Move Pin " -msgstr "Déplace Pin" - -#: eeschema/libedit_onrightclick.cpp:239 -msgid "Edit Pin " -msgstr "Editer Pin" - -#: eeschema/libedit_onrightclick.cpp:244 -msgid "Delete Pin " -msgstr "Supprimer Pin" - -#: eeschema/libedit_onrightclick.cpp:252 -msgid "Global" -msgstr "Global" - -#: eeschema/libedit_onrightclick.cpp:255 -msgid "Pin Size to selected pins" -msgstr "Change taille pins sélectionnées" - -#: eeschema/libedit_onrightclick.cpp:256 -msgid "Pin Size to Others" -msgstr "Change Taille autres Pins" - -#: eeschema/libedit_onrightclick.cpp:259 -msgid "Pin Name Size to selected pin" -msgstr "Change taille Nom pin sélectionnées" - -#: eeschema/libedit_onrightclick.cpp:260 -msgid "Pin Name Size to Others" -msgstr "Change taille Nom Pin autres Pins" - -#: eeschema/libedit_onrightclick.cpp:263 -msgid "Pin Num Size to selected pin" -msgstr "Change taille Num pins sélectionnées" - -#: eeschema/libedit_onrightclick.cpp:264 -msgid "Pin Num Size to Others" -msgstr "Change Taille Num Pin autres Pins" - -#: eeschema/libedit_onrightclick.cpp:288 -msgid "Select Items" -msgstr "Sélection des Eléments" +#: eeschema/schedit.cpp:237 +msgid "Add Power" +msgstr "Ajouter Alims" #: eeschema/dialog_edit_libentry_fields_in_lib.cpp:160 #: eeschema/dialog_edit_libentry_fields_in_lib.cpp:165 @@ -9454,14 +9068,13 @@ msgstr "" "Un alias %s existe déjà!\n" "Ne peut mettre à jour ce composant" -#: eeschema/dialog_edit_component_in_schematic.cpp:170 -msgid "No Component Name!" -msgstr "Pas de nom de composant!" +#: eeschema/save_schemas.cpp:63 +msgid "Schematic Files" +msgstr "Fichiers Schématiques" -#: eeschema/dialog_edit_component_in_schematic.cpp:177 -#, c-format -msgid "Component [%s] not found!" -msgstr "Composant [%s] non trouvé!" +#: eeschema/save_schemas.cpp:93 +msgid "File write operation failed." +msgstr "Erreur sur écriture sur fichier." #: eeschema/dialog_eeschema_config_fbp.cpp:20 msgid "Component library files" @@ -9521,34 +9134,26 @@ msgstr "Le fichier n'est PAS une librairie EESCHEMA !" msgid "The file header is missing version and time stamp information." msgstr "L'entête de fichier ne comporte pas de numéro de version et de signature temporelle." -#: eeschema/class_library.cpp:513 -#, c-format -msgid "" -"The component library <%s> header version number is invalid.\n" -"\n" -"In future versions of EESchema this library may not load correctly. To resolve this problem open the library in the library editor and save it. If this library is the project cache library, save the current schematic." -msgstr "" - -#: eeschema/class_library.cpp:537 +#: eeschema/class_library.cpp:540 msgid "An error occurred attempting to read the header." msgstr "Une erreur s'est produite lors de la lecture de l'entête." -#: eeschema/class_library.cpp:568 +#: eeschema/class_library.cpp:571 #, c-format msgid "Library <%s> component load error %s." msgstr "Librairie <%s> erreur de chargement du composant %s." -#: eeschema/class_library.cpp:639 +#: eeschema/class_library.cpp:642 #, c-format msgid "Could not open component document library file <%s>." msgstr "Ne peut ouvrir le fichier document librairie <%s>." -#: eeschema/class_library.cpp:646 +#: eeschema/class_library.cpp:649 #, c-format msgid "Component document library file <%s> is empty." msgstr "Fichier document de composants <%s> vide." -#: eeschema/class_library.cpp:654 +#: eeschema/class_library.cpp:657 #, c-format msgid "File <%s> is not a valid component library document file." msgstr "<%s> n'est pas un fichier documentation de composant valide." @@ -9806,10 +9411,6 @@ msgstr "Imprimer Tout" msgid "Current" msgstr "Courant" -#: eeschema/class_sch_component.cpp:1114 -msgid "Power symbol" -msgstr "Symbole d'alimentation" - #: eeschema/eelibs_read_libraryfiles.cpp:61 msgid "\n" msgstr "\n" @@ -10037,6 +9638,142 @@ msgstr "" msgid "Footprint Filter" msgstr "Filtrage Modules" +#: eeschema/libedit_onrightclick.cpp:83 +msgid "Move Arc " +msgstr "Déplacer arc" + +#: eeschema/libedit_onrightclick.cpp:89 +msgid "Arc Options" +msgstr "Options pour l'Arc" + +#: eeschema/libedit_onrightclick.cpp:92 +msgid "Delete Arc " +msgstr "Effacer Arc" + +#: eeschema/libedit_onrightclick.cpp:102 +msgid "Move Circle " +msgstr "Déplacer Cercle" + +#: eeschema/libedit_onrightclick.cpp:108 +msgid "Circle Options" +msgstr "Options pour le Cercle" + +#: eeschema/libedit_onrightclick.cpp:111 +msgid "Delete Circle " +msgstr "Supprimer Cercle" + +#: eeschema/libedit_onrightclick.cpp:121 +msgid "Move Rect " +msgstr "Déplacer Rect" + +#: eeschema/libedit_onrightclick.cpp:127 +msgid "Rect Options" +msgstr "Options pour le Rectangle" + +#: eeschema/libedit_onrightclick.cpp:130 +msgid "Delete Rect " +msgstr "Supprimer Rect" + +#: eeschema/libedit_onrightclick.cpp:140 +msgid "Move Text " +msgstr "Déplacer Texte" + +#: eeschema/libedit_onrightclick.cpp:146 +msgid "Text Editor" +msgstr "Editeur de Texte" + +#: eeschema/libedit_onrightclick.cpp:148 +msgid "Rotate Text" +msgstr "Rot. Texte" + +#: eeschema/libedit_onrightclick.cpp:151 +msgid "Delete Text " +msgstr "Supprimer Texte" + +#: eeschema/libedit_onrightclick.cpp:161 +msgid "Move Line " +msgstr "Déplacer Ligne" + +#: eeschema/libedit_onrightclick.cpp:169 +msgid "Line End" +msgstr "Fin ligne" + +#: eeschema/libedit_onrightclick.cpp:172 +msgid "Line Options" +msgstr "Options pour Ligne" + +#: eeschema/libedit_onrightclick.cpp:175 +msgid "Delete Line " +msgstr "Efface Ligne" + +#: eeschema/libedit_onrightclick.cpp:184 +msgid "Delete Segment " +msgstr "Supprimer Segment" + +#: eeschema/libedit_onrightclick.cpp:196 +msgid "Move Field " +msgstr "Déplace Champ" + +#: eeschema/libedit_onrightclick.cpp:202 +msgid "Field Rotate" +msgstr "Rotation Champ" + +#: eeschema/libedit_onrightclick.cpp:204 +msgid "Field Edit" +msgstr "Edition du champ" + +#: eeschema/libedit_onrightclick.cpp:233 +msgid "Move Pin " +msgstr "Déplace Pin" + +#: eeschema/libedit_onrightclick.cpp:239 +msgid "Edit Pin " +msgstr "Editer Pin" + +#: eeschema/libedit_onrightclick.cpp:242 +msgid "Rotate Pin " +msgstr "Rotation Pin" + +#: eeschema/libedit_onrightclick.cpp:247 +msgid "Delete Pin " +msgstr "Supprimer Pin" + +#: eeschema/libedit_onrightclick.cpp:255 +msgid "Global" +msgstr "Global" + +#: eeschema/libedit_onrightclick.cpp:258 +msgid "Pin Size to selected pins" +msgstr "Change taille pins sélectionnées" + +#: eeschema/libedit_onrightclick.cpp:259 +msgid "Pin Size to Others" +msgstr "Change Taille autres Pins" + +#: eeschema/libedit_onrightclick.cpp:262 +msgid "Pin Name Size to selected pin" +msgstr "Change taille Nom pin sélectionnées" + +#: eeschema/libedit_onrightclick.cpp:263 +msgid "Pin Name Size to Others" +msgstr "Change taille Nom Pin autres Pins" + +#: eeschema/libedit_onrightclick.cpp:266 +msgid "Pin Num Size to selected pin" +msgstr "Change taille Num pins sélectionnées" + +#: eeschema/libedit_onrightclick.cpp:267 +msgid "Pin Num Size to Others" +msgstr "Change Taille Num Pin autres Pins" + +#: eeschema/libedit_onrightclick.cpp:291 +msgid "Select Items" +msgstr "Sélection des Eléments" + +#: eeschema/libedit_onrightclick.cpp:295 +msgid "Mirror Block ||" +msgstr "Miroir Bloc ||" + #: eeschema/tool_viewlib.cpp:38 msgid "Select library to browse" msgstr "Sélection de la librairie à examiner" @@ -10168,6 +9905,10 @@ msgstr "ERC" msgid "Reset" msgstr "Défaut" +#: eeschema/class_sch_component.cpp:1114 +msgid "Power symbol" +msgstr "Symbole d'alimentation" + #: eeschema/dialog_sch_sheet_props_base.cpp:25 msgid "&File name:" msgstr "Nom &Fichier:" @@ -10178,9 +9919,6 @@ msgstr "Taille du te&xte:" #: eeschema/dialog_sch_sheet_props_base.cpp:42 #: eeschema/dialog_sch_sheet_props_base.cpp:63 -#: eeschema/dialog_lib_edit_pin_base.cpp:41 -#: eeschema/dialog_lib_edit_pin_base.cpp:64 -#: eeschema/dialog_lib_edit_pin_base.cpp:87 msgid "units" msgstr "unités" @@ -10229,6 +9967,299 @@ msgstr " a été créé par une version plus ancienne de Eeschema. Il sera enreg msgid "Done Loading " msgstr "Chargement terminé " +#: eeschema/onrightclick.cpp:117 +msgid "Leave Sheet" +msgstr "Quitter sous-feuille" + +#: eeschema/onrightclick.cpp:132 +msgid "Delete Noconn" +msgstr "Supprimer Non Connexion" + +#: eeschema/onrightclick.cpp:142 +msgid "Move Bus Entry" +msgstr "Déplacer Entrée de Bus" + +#: eeschema/onrightclick.cpp:150 +msgid "Set Bus Entry /" +msgstr "Entrée de Bus /" + +#: eeschema/onrightclick.cpp:153 +msgid "Set Bus Entry \\" +msgstr "Entrée de Bus \\" + +#: eeschema/onrightclick.cpp:155 +msgid "Delete Bus Entry" +msgstr "Supprimer Entrée de Bus" + +#: eeschema/onrightclick.cpp:252 +msgid "Move Field" +msgstr "Déplace Champ" + +#: eeschema/onrightclick.cpp:258 +msgid "Rotate Field" +msgstr "Rotation Champ" + +#: eeschema/onrightclick.cpp:263 +msgid "Edit Field" +msgstr "Editer Champ" + +#: eeschema/onrightclick.cpp:291 +msgid "Move Component" +msgstr "Déplace Composant" + +#: eeschema/onrightclick.cpp:296 +msgid "Drag Component" +msgstr "Drag Composant" + +#: eeschema/onrightclick.cpp:309 +msgid "Mirror --" +msgstr "Miroir--" + +#: eeschema/onrightclick.cpp:312 +msgid "Mirror ||" +msgstr "Miroir ||" + +#: eeschema/onrightclick.cpp:320 +msgid "Orient Component" +msgstr "Oriente Composant" + +#: eeschema/onrightclick.cpp:338 +msgid "Footprint " +msgstr "Empreinte: " + +#: eeschema/onrightclick.cpp:354 +#, c-format +msgid "Unit %d %c" +msgstr "Unité %d %c" + +#: eeschema/onrightclick.cpp:366 +msgid "Edit Component" +msgstr "Edite Composant" + +#: eeschema/onrightclick.cpp:370 +msgid "Copy Component" +msgstr "Copie Composant" + +#: eeschema/onrightclick.cpp:394 +msgid "Move Global Label" +msgstr "Déplacer Label Global" + +#: eeschema/onrightclick.cpp:398 +msgid "Copy Global Label" +msgstr "Copier Label Global" + +#: eeschema/onrightclick.cpp:404 +msgid "Rotate Global Label" +msgstr "Rot. Label Global" + +#: eeschema/onrightclick.cpp:408 +msgid "Edit Global Label" +msgstr "Editer Label Global" + +#: eeschema/onrightclick.cpp:412 +msgid "Delete Global Label" +msgstr "Supprimer Label Global" + +#: eeschema/onrightclick.cpp:419 +#: eeschema/onrightclick.cpp:506 +#: eeschema/onrightclick.cpp:557 +msgid "Change to Hierarchical Label" +msgstr "Changer en Label Hiérarchique" + +#: eeschema/onrightclick.cpp:421 +#: eeschema/onrightclick.cpp:463 +#: eeschema/onrightclick.cpp:554 +msgid "Change to Label" +msgstr "Change en Label" + +#: eeschema/onrightclick.cpp:423 +#: eeschema/onrightclick.cpp:465 +#: eeschema/onrightclick.cpp:508 +msgid "Change to Text" +msgstr "Change en Texte" + +#: eeschema/onrightclick.cpp:426 +#: eeschema/onrightclick.cpp:470 +#: eeschema/onrightclick.cpp:513 +#: eeschema/onrightclick.cpp:564 +msgid "Change Type" +msgstr "Change Type" + +#: eeschema/onrightclick.cpp:437 +msgid "Move Hierarchical Label" +msgstr "Déplacer Label Hiérarchique" + +#: eeschema/onrightclick.cpp:442 +msgid "Copy Hierarchical Label" +msgstr "Copier Label Hiérarchique" + +#: eeschema/onrightclick.cpp:448 +#: eeschema/onrightclick.cpp:451 +msgid "Rotate Hierarchical Label" +msgstr "Rot. Label Hiérarchique" + +#: eeschema/onrightclick.cpp:452 +#: eeschema/onrightclick.cpp:455 +msgid "Edit Hierarchical Label" +msgstr "Editer Label Hiérarchique" + +#: eeschema/onrightclick.cpp:456 +msgid "Delete Hierarchical Label" +msgstr "Supprimer Label Hiérarchique" + +#: eeschema/onrightclick.cpp:467 +#: eeschema/onrightclick.cpp:510 +msgid "Change to Global Label" +msgstr "Change en Label Global" + +#: eeschema/onrightclick.cpp:481 +msgid "Move Label" +msgstr "Déplace Label" + +#: eeschema/onrightclick.cpp:485 +msgid "Copy Label" +msgstr "Copier Label" + +#: eeschema/onrightclick.cpp:491 +msgid "Rotate Label" +msgstr "Rot. Label" + +#: eeschema/onrightclick.cpp:495 +msgid "Edit Label" +msgstr "Editer Label" + +#: eeschema/onrightclick.cpp:499 +msgid "Delete Label" +msgstr "Supprimer Label" + +#: eeschema/onrightclick.cpp:524 +msgid "Move Text" +msgstr "Déplacer Texte" + +#: eeschema/onrightclick.cpp:529 +msgid "Copy Text" +msgstr "CopierTexte" + +#: eeschema/onrightclick.cpp:539 +msgid "Edit Text" +msgstr "Editer Texte" + +#: eeschema/onrightclick.cpp:543 +msgid "Delete Text" +msgstr "Effacer Texte" + +#: eeschema/onrightclick.cpp:561 +msgid "Change to Glabel" +msgstr "Change en Label Global" + +#: eeschema/onrightclick.cpp:580 +#: eeschema/onrightclick.cpp:627 +msgid "Break Wire" +msgstr "Briser Fil" + +#: eeschema/onrightclick.cpp:583 +msgid "Delete Junction" +msgstr "Supprimer Jonction" + +#: eeschema/onrightclick.cpp:592 +#: eeschema/onrightclick.cpp:620 +msgid "Delete Node" +msgstr "Supprimer Noeud" + +#: eeschema/onrightclick.cpp:594 +#: eeschema/onrightclick.cpp:623 +msgid "Delete Connection" +msgstr "Supprimer Connexion" + +#: eeschema/onrightclick.cpp:608 +msgid "Wire End" +msgstr "Terminer Fil" + +#: eeschema/onrightclick.cpp:612 +msgid "Drag Wire" +msgstr "Drag Fil" + +#: eeschema/onrightclick.cpp:617 +msgid "Delete Wire" +msgstr "Supprimer Fil" + +#: eeschema/onrightclick.cpp:641 +#: eeschema/onrightclick.cpp:673 +msgid "Add Global Label" +msgstr "Ajout Label Global" + +#: eeschema/onrightclick.cpp:653 +msgid "Bus End" +msgstr "Terminer Bus" + +#: eeschema/onrightclick.cpp:657 +msgid "Delete Bus" +msgstr "Supprimer Bus" + +#: eeschema/onrightclick.cpp:660 +msgid "Break Bus" +msgstr "Briser Bus" + +#: eeschema/onrightclick.cpp:684 +msgid "Enter Sheet" +msgstr "Entrer dans Feuille" + +#: eeschema/onrightclick.cpp:686 +msgid "Move Sheet" +msgstr "Déplacer Feuille" + +#: eeschema/onrightclick.cpp:694 +msgid "Place Sheet" +msgstr "Placer Feuille" + +#: eeschema/onrightclick.cpp:699 +msgid "Edit Sheet" +msgstr "Editer Feuille" + +#: eeschema/onrightclick.cpp:705 +msgid "Resize Sheet" +msgstr "Redimensionner Feuille" + +#: eeschema/onrightclick.cpp:708 +msgid "Import PinSheets" +msgstr "Importer Connecteur de Hiérarchie" + +#: eeschema/onrightclick.cpp:712 +msgid "Cleanup PinSheets" +msgstr "Nettoyage des Pins Hiérarchiques" + +#: eeschema/onrightclick.cpp:714 +msgid "Delete Sheet" +msgstr "Supprimer Feuille" + +#: eeschema/onrightclick.cpp:725 +msgid "Move PinSheet" +msgstr "Déplace Connecteur de hiérarchie" + +#: eeschema/onrightclick.cpp:731 +msgid "Edit PinSheet" +msgstr "Edit Connecteur de hiérarchie" + +#: eeschema/onrightclick.cpp:735 +msgid "Delete PinSheet" +msgstr "Supprimer Connecteur de hiérarchie" + +#: eeschema/onrightclick.cpp:748 +msgid "Window Zoom" +msgstr "Zoom sur Fenètre" + +#: eeschema/onrightclick.cpp:757 +msgid "Save Block" +msgstr "Sauver Bloc" + +#: eeschema/onrightclick.cpp:760 +msgid "Drag Block" +msgstr "Drag Bloc" + +#: eeschema/onrightclick.cpp:770 +msgid "Copy to Clipboard" +msgstr "Copie dans Presse papier" + #: eeschema/dialog_lib_edit_pin_base.cpp:24 msgid "Pin &name:" msgstr "Nom pi&n:" @@ -10317,14 +10348,6 @@ msgstr "Remplissage en a&rriere plan" msgid "Library files:" msgstr "Fichiers Librairies:" -#: eeschema/save_schemas.cpp:66 -msgid "Schematic Files" -msgstr "Fichiers Schématiques" - -#: eeschema/save_schemas.cpp:96 -msgid "File write operation failed." -msgstr "Erreur sur écriture sur fichier." - #: eeschema/dialog_eeschema_options_base.cpp:34 msgid "Mesurement &units:" msgstr "&Unités de mesure:" @@ -10533,6 +10556,15 @@ msgstr "Montrer Numéro de Pin" msgid "You must provide a name for this component" msgstr "Vous devez fournir un nom pour ce composant" +#: eeschema/dialog_edit_component_in_schematic.cpp:170 +msgid "No Component Name!" +msgstr "Pas de nom de composant!" + +#: eeschema/dialog_edit_component_in_schematic.cpp:177 +#, c-format +msgid "Component [%s] not found!" +msgstr "Composant [%s] non trouvé!" + #: eeschema/component_wizard/dialog_component_setup.cpp:137 msgid "Quick KICAD Library Component Builder" msgstr "" @@ -10639,53 +10671,6 @@ msgstr "Clock Active Bas" msgid "Active Low Output" msgstr "Sortie Active Bas" -#: cvpcb/cvframe.cpp:281 -msgid "" -"Net and component list modified.\n" -"Save before exit ?" -msgstr "" -"Netlist et liste composants modifiés,\n" -"Sauver avant de quitter ?" - -#: cvpcb/cvframe.cpp:305 -msgid "Problem when saving files, exit anyway ?" -msgstr "Problème en sauvant les fichiers, quitter quand même" - -#: cvpcb/cvframe.cpp:431 -msgid "Delete selections" -msgstr "Effacement des associations existantes" - -#: cvpcb/cvframe.cpp:445 -#: cvpcb/init.cpp:65 -#: cvpcb/init.cpp:115 -#, c-format -msgid "Components: %d (free: %d)" -msgstr "Composants: %d (libres: %d)" - -#: cvpcb/cvframe.cpp:467 -msgid "unnamed" -msgstr "non nommé" - -#: cvpcb/cvframe.cpp:469 -msgid "Open Net List" -msgstr "Ouvrir Fichier Netliste" - -#: cvpcb/cvpcb.cpp:29 -msgid "Kicad retroannotation files (*.stf)|*.stf" -msgstr "Fichiers de retroannotaion Kicad (*.stf)|*.stf" - -#: cvpcb/cvpcb.cpp:30 -msgid "Kicad footprint alias files (*.equ)|*.equ" -msgstr "Fichiers alias modules Kicad (*.equ)|*.equ" - -#: cvpcb/cvpcb.cpp:53 -msgid "Cvpcb is already running, Continue?" -msgstr "Cvpcb est en cours d'exécution. Continuer ?" - -#: cvpcb/cvpcb.cpp:95 -msgid " [no file]" -msgstr " [pas de fichier]" - #: cvpcb/setvisu.cpp:47 msgid "Footprint: " msgstr "Module: " @@ -10722,6 +10707,53 @@ msgstr "Certains fichiers n'ont pas pu être trouvés!" msgid "Some files are invalid!" msgstr "Certains fichiers sont invalides!" +#: cvpcb/cvpcb.cpp:29 +msgid "Kicad retroannotation files (*.stf)|*.stf" +msgstr "Fichiers de retroannotaion Kicad (*.stf)|*.stf" + +#: cvpcb/cvpcb.cpp:30 +msgid "Kicad footprint alias files (*.equ)|*.equ" +msgstr "Fichiers alias modules Kicad (*.equ)|*.equ" + +#: cvpcb/cvpcb.cpp:86 +msgid "Cvpcb is already running, Continue?" +msgstr "Cvpcb est en cours d'exécution. Continuer ?" + +#: cvpcb/cvpcb.cpp:128 +msgid " [no file]" +msgstr " [pas de fichier]" + +#: cvpcb/cvframe.cpp:284 +msgid "" +"Net and component list modified.\n" +"Save before exit ?" +msgstr "" +"Netlist et liste composants modifiés,\n" +"Sauver avant de quitter ?" + +#: cvpcb/cvframe.cpp:308 +msgid "Problem when saving files, exit anyway ?" +msgstr "Problème en sauvant les fichiers, quitter quand même" + +#: cvpcb/cvframe.cpp:434 +msgid "Delete selections" +msgstr "Effacement des associations existantes" + +#: cvpcb/cvframe.cpp:448 +#: cvpcb/init.cpp:65 +#: cvpcb/init.cpp:115 +#, c-format +msgid "Components: %d (free: %d)" +msgstr "Composants: %d (libres: %d)" + +#: cvpcb/cvframe.cpp:470 +msgid "unnamed" +msgstr "non nommé" + +#: cvpcb/cvframe.cpp:472 +msgid "Open Net List" +msgstr "Ouvrir Fichier Netliste" + #: cvpcb/genorcad.cpp:127 #, c-format msgid "%s %s pin %s : Different Nets" @@ -11193,31 +11225,6 @@ msgstr "Archiver les fichiers du projet" msgid "Refresh project tree" msgstr "Mettre à jour l'affichage du projet" -#: kicad/mainframe.cpp:82 -#, c-format -msgid "" -"Ready\n" -"Working dir: %s\n" -msgstr "" -"Prêt\n" -"Répertoire de travail: %s\n" - -#: kicad/mainframe.cpp:275 -msgid "Execute Python Script" -msgstr "Executer un Script Python" - -#: kicad/mainframe.cpp:276 -msgid "Python script (*.py)|*.py" -msgstr "Script Python (*.py)|*.py" - -#: kicad/mainframe.cpp:297 -msgid "Text file (" -msgstr "Fichier Texte (" - -#: kicad/mainframe.cpp:299 -msgid "Load File to Edit" -msgstr "Fichier à Editer" - #: kicad/prjconfig.cpp:37 msgid "Project template file not found " msgstr "Fichier modèle non trouvé" @@ -11235,10 +11242,12 @@ msgid "Kicad project file <" msgstr "Fichier projet Kicad <" #: kicad/prjconfig.cpp:108 +#: kicad/kicad.cpp:78 msgid "Working dir: " msgstr "Répertoire de travail: " #: kicad/prjconfig.cpp:109 +#: kicad/kicad.cpp:79 msgid "" "\n" "Project: " @@ -11246,6 +11255,10 @@ msgstr "" "\n" "Projet: " +#: kicad/kicad.cpp:97 +msgid "noname" +msgstr "noname" + #: kicad/commandframe.cpp:72 msgid "EESchema (Schematic editor)" msgstr "EESchema (Editeur de Schématique)" @@ -11425,9 +11438,30 @@ msgstr "Changer Nom Fichier: " msgid "Change filename" msgstr "Changer Nom Fichier" -#: kicad/kicad.cpp:64 -msgid "noname" -msgstr "noname" +#: kicad/mainframe.cpp:88 +#, c-format +msgid "" +"Ready\n" +"Working dir: %s\n" +msgstr "" +"Prêt\n" +"Répertoire de travail: %s\n" + +#: kicad/mainframe.cpp:270 +msgid "Execute Python Script" +msgstr "Executer un Script Python" + +#: kicad/mainframe.cpp:271 +msgid "Python script (*.py)|*.py" +msgstr "Script Python (*.py)|*.py" + +#: kicad/mainframe.cpp:292 +msgid "Text file (" +msgstr "Fichier Texte (" + +#: kicad/mainframe.cpp:294 +msgid "Load File to Edit" +msgstr "Fichier à Editer" #: gerbview/options.cpp:148 msgid "Gerbview Options" @@ -11474,14 +11508,6 @@ msgstr "Fichiers Gerber DCODE (%s)|*.%s" msgid "Load GERBER DCODE File" msgstr "Charger Fichier de DCodes" -#: gerbview/gerbview.cpp:37 -msgid "GerbView project files (.cnf)|*.cnf" -msgstr "Fichiers projet GerbView (.cnf)|*.cnf" - -#: gerbview/gerbview.cpp:82 -msgid "GerbView is already running. Continue?" -msgstr "Gerbview est en cours d'exécution. Continuer ?" - #: gerbview/files.cpp:72 msgid "Not yet available..." msgstr "non encore disponible" @@ -11596,6 +11622,14 @@ msgstr "Les données courante seront perdues ?" msgid "Delete layer %d?" msgstr "Effacer couche %d" +#: gerbview/gerbview.cpp:37 +msgid "GerbView project files (.cnf)|*.cnf" +msgstr "Fichiers projet GerbView (.cnf)|*.cnf" + +#: gerbview/gerbview.cpp:90 +msgid "GerbView is already running. Continue?" +msgstr "Gerbview est en cours d'exécution. Continuer ?" + #: gerbview/select_layers_to_pcb.cpp:213 #: gerbview/tool_gerber.cpp:240 msgid "Layer " @@ -11606,10 +11640,6 @@ msgstr "Couche " msgid "Do not export" msgstr "Ne pas exporter" -#: gerbview/gerberframe.cpp:209 -msgid "Layer modified, Continue ?" -msgstr "Couche modifiée, Continuer ?" - #: gerbview/onrightclick.cpp:57 msgid "Copy Block (shift mouse)" msgstr "Copie Bloc (shift souris)" @@ -11742,6 +11772,10 @@ msgstr " Sélection options générales" msgid "Select how items are displayed" msgstr "Sélectionner comment les éléments sont à afficher" +#: gerbview/tool_gerber.cpp:93 +msgid "&Save Setup" +msgstr "&Sauver Options" + #: gerbview/tool_gerber.cpp:107 msgid "&List DCodes" msgstr "&Liste DCodes" @@ -11778,6 +11812,10 @@ msgstr "&Au sujet de Gerbview" msgid "About gerbview gerber and drill viewer" msgstr "Au sujet de GerbView" +#: gerbview/tool_gerber.cpp:128 +msgid "&Miscellaneous" +msgstr "&Divers" + #: gerbview/tool_gerber.cpp:164 msgid "New world" msgstr "Nouvelle photo" @@ -11906,6 +11944,10 @@ msgstr " Afficher Limites de Page" msgid "Show D codes" msgstr "Montrer DCodes" +#: gerbview/gerberframe.cpp:214 +msgid "Layer modified, Continue ?" +msgstr "Couche modifiée, Continuer ?" + #: common/gestfich.cpp:446 #, c-format msgid "Command <%s> could not found" @@ -11935,6 +11977,71 @@ msgstr "" msgid "Unable to find a PDF viewer for" msgstr "Impossible de trouver un visualisateur PDF pour" +#: common/selcolor.cpp:67 +msgid "Colors" +msgstr "Couleurs" + +#: common/confirm.cpp:83 +msgid "Error" +msgstr "Erreur" + +#: common/zoom.cpp:188 +msgid "Center" +msgstr "Centrer" + +#: common/zoom.cpp:196 +msgid "Zoom select" +msgstr "Sélection Zoom" + +#: common/zoom.cpp:218 +msgid "Zoom: " +msgstr "Zoom: " + +#: common/zoom.cpp:229 +msgid "Grid Select" +msgstr "Sélection Grille" + +#: common/zoom.cpp:250 +msgid "Grid: " +msgstr "Grille: " + +#: common/richio.cpp:67 +msgid "Line length exceeded" +msgstr "Longueur de ligne dépassée" + +#: common/richio.cpp:177 +msgid "Error writing to STRINGFORMATTER" +msgstr "Erreur d'écriture à STRINGFORMATTER" + +#: common/eda_doc.cpp:149 +msgid "Doc File " +msgstr "Fichier de Doc " + +#: common/eda_doc.cpp:190 +#, c-format +msgid "Unknown MIME type for doc file <%s>" +msgstr "MIME type inconnu pour fichier Doc <%s>" + +#: common/pcbcommon.cpp:61 +msgid "??? Via" +msgstr "??? Via" + +#: common/pcbcommon.cpp:64 +msgid "Blind/Buried Via" +msgstr "Via Aveugle/Enterrée" + +#: common/pcbcommon.cpp:66 +msgid "Through Via" +msgstr "Via Traversante" + +#: common/pcbcommon.cpp:84 +msgid "Kicad footprint library files (*.mod)|*.mod" +msgstr "Fichiers Modules Kicad (*.mod)|*.mod" + +#: common/pcbcommon.cpp:87 +msgid "Printed circuit board files (*.brd)|*.brd" +msgstr "Fichiers circuits imprimés (*.brd)|*.brd" + #: common/edaappl.cpp:112 msgid "French" msgstr "Français" @@ -11991,79 +12098,14 @@ msgstr "Catalan" msgid "Dutch" msgstr "Hollandais" -#: common/edaappl.cpp:796 +#: common/edaappl.cpp:800 msgid "Language" msgstr "Langue" -#: common/edaappl.cpp:797 +#: common/edaappl.cpp:801 msgid "Select application language (only for testing!)" msgstr "Choisir la langue (seulement pour tests!)" -#: common/selcolor.cpp:67 -msgid "Colors" -msgstr "Couleurs" - -#: common/confirm.cpp:83 -msgid "Error" -msgstr "Erreur" - -#: common/zoom.cpp:185 -msgid "Center" -msgstr "Centrer" - -#: common/zoom.cpp:193 -msgid "Zoom select" -msgstr "Sélection Zoom" - -#: common/zoom.cpp:215 -msgid "Zoom: " -msgstr "Zoom: " - -#: common/zoom.cpp:226 -msgid "Grid Select" -msgstr "Sélection Grille" - -#: common/zoom.cpp:247 -msgid "Grid: " -msgstr "Grille: " - -#: common/richio.cpp:67 -msgid "Line length exceeded" -msgstr "Longueur de ligne dépassée" - -#: common/richio.cpp:177 -msgid "Error writing to STRINGFORMATTER" -msgstr "Erreur d'écriture à STRINGFORMATTER" - -#: common/eda_doc.cpp:149 -msgid "Doc File " -msgstr "Fichier de Doc " - -#: common/eda_doc.cpp:190 -#, c-format -msgid "Unknown MIME type for doc file <%s>" -msgstr "MIME type inconnu pour fichier Doc <%s>" - -#: common/pcbcommon.cpp:61 -msgid "??? Via" -msgstr "??? Via" - -#: common/pcbcommon.cpp:64 -msgid "Blind/Buried Via" -msgstr "Via Aveugle/Enterrée" - -#: common/pcbcommon.cpp:66 -msgid "Through Via" -msgstr "Via Traversante" - -#: common/pcbcommon.cpp:84 -msgid "Kicad footprint library files (*.mod)|*.mod" -msgstr "Fichiers Modules Kicad (*.mod)|*.mod" - -#: common/pcbcommon.cpp:87 -msgid "Printed circuit board files (*.brd)|*.brd" -msgstr "Fichiers circuits imprimés (*.brd)|*.brd" - #: common/common.cpp:60 msgid "Kicad project files (*.pro)|*.pro" msgstr "Fichiers projet Kicad (*.pro)|*.pro" @@ -12148,20 +12190,20 @@ msgstr "Le caractère de délimitation de ligne doit être un seul caractère ' msgid "Un-terminated delimited string" msgstr "Ligne délimitée non terminée" -#: common/basicframe.cpp:208 +#: common/basicframe.cpp:207 msgid " file <" msgstr " Fichier <" -#: common/basicframe.cpp:208 +#: common/basicframe.cpp:207 msgid "> was not found." msgstr "> non trouvé." -#: common/basicframe.cpp:242 +#: common/basicframe.cpp:241 #, c-format msgid "Help file %s not found" msgstr "Fichier d'aide %s non trouvé" -#: common/basicframe.cpp:251 +#: common/basicframe.cpp:250 #, c-format msgid "Help file %s could not be found." msgstr "Fichier d'aide %s non trouvé." @@ -12202,59 +12244,67 @@ msgstr "Ouvrir Fichier Configuration des Hotkeys:" msgid "Unable to read " msgstr "Impossible de lire " +#: common/hotkeys_basic.cpp:629 +msgid "List Current Keys" +msgstr "Lister Touches Courantes" + #: common/hotkeys_basic.cpp:630 -msgid "Show the current hotkey configuration" -msgstr "Afficher la configuration actuelle des Hotkeys" +msgid "Displays the current hotkeys list and corresponding commands" +msgstr "Afficher la liste des hotkeyc courante et les commandes correspondantes" #: common/hotkeys_basic.cpp:636 -msgid "(Re)create" -msgstr "(Re)créer" +msgid "(Re)create Hotkeys File" +msgstr "(Re)créer Fichier Hotkeys" #: common/hotkeys_basic.cpp:637 msgid "Create or recreate the hotkey configuration file from current hotkey list" msgstr "Créer ou recréer le fichier configuration des Hotkeys à partir de la liste courante" #: common/hotkeys_basic.cpp:644 -msgid "Reload" -msgstr "Recharger" +msgid "Reload Hotkeys File" +msgstr "Relire Fichiers Hotkeys" #: common/hotkeys_basic.cpp:645 msgid "Reload the hotkey configuration file" msgstr "Relire les fichiers configuration des hotkeys" +#: common/hotkeys_basic.cpp:651 +msgid "Edit Hotkeys File" +msgstr "Editer Fichier Hotkeys" + #: common/hotkeys_basic.cpp:652 msgid "Edit the hotkey configuration file in a text editor" msgstr "Editer les fichiers configuration des hotkeys" #: common/hotkeys_basic.cpp:658 -msgid "Hotkey" -msgstr "Hotkey" +msgid "Hotkeys" +msgstr "Hotkeys" -#: common/hotkeys_basic.cpp:660 -msgid "Hotkey configuration and preferences" +#: common/hotkeys_basic.cpp:659 +msgid "Hotkeys configuration and preferences" msgstr "Options et préférences générales des hotkeys" -#: common/hotkeys_basic.cpp:668 +#: common/hotkeys_basic.cpp:667 msgid "Home directory" msgstr "Répertoire d'accueil (home)" -#: common/hotkeys_basic.cpp:669 +#: common/hotkeys_basic.cpp:668 msgid "Use home directory to load or store Hotkey config files" msgstr "Utiliser le répertoire d'accueil pour charger ou sauver les fichiers de config des Hotkeys" -#: common/hotkeys_basic.cpp:676 +#: common/hotkeys_basic.cpp:675 msgid "KiCad template directory" msgstr "kicad/template répertoire" -#: common/hotkeys_basic.cpp:677 +#: common/hotkeys_basic.cpp:676 msgid "Use kicad/template directory to load or store Hotkey config files" msgstr "Utiliser répertoire kicad/template pour charger ou sauver les fichiers de config des Hotkeys" -#: common/hotkeys_basic.cpp:683 +#: common/hotkeys_basic.cpp:682 msgid "Location" msgstr "Emplacement" -#: common/hotkeys_basic.cpp:684 +#: common/hotkeys_basic.cpp:683 msgid "Select hotkey configuration file location" msgstr "Sélectionner l'emplacement du fichier fonfiguration des hotkeys:" @@ -12306,57 +12356,57 @@ msgstr "Bloc Miroir" msgid "Vertex " msgstr "Vertex " -#: 3d-viewer/3d_canvas.cpp:308 +#: 3d-viewer/3d_canvas.cpp:305 msgid "Zoom +" msgstr "Zoom +" -#: 3d-viewer/3d_canvas.cpp:313 +#: 3d-viewer/3d_canvas.cpp:310 msgid "Zoom -" msgstr "Zoom -" -#: 3d-viewer/3d_canvas.cpp:319 +#: 3d-viewer/3d_canvas.cpp:316 msgid "Top View" msgstr "Vue de dessus" -#: 3d-viewer/3d_canvas.cpp:324 +#: 3d-viewer/3d_canvas.cpp:321 msgid "Bottom View" msgstr "Vue de dessous" -#: 3d-viewer/3d_canvas.cpp:330 +#: 3d-viewer/3d_canvas.cpp:327 msgid "Right View" msgstr "Vue à Droite" -#: 3d-viewer/3d_canvas.cpp:335 +#: 3d-viewer/3d_canvas.cpp:332 msgid "Left View" msgstr "Vue à Gauche" -#: 3d-viewer/3d_canvas.cpp:342 +#: 3d-viewer/3d_canvas.cpp:339 msgid "Front View" msgstr "Vue de face" -#: 3d-viewer/3d_canvas.cpp:347 +#: 3d-viewer/3d_canvas.cpp:344 msgid "Back View" msgstr "Vue arrière" -#: 3d-viewer/3d_canvas.cpp:353 +#: 3d-viewer/3d_canvas.cpp:350 #: 3d-viewer/3d_toolbar.cpp:85 msgid "Move left <-" msgstr "Vers la gauche <-" -#: 3d-viewer/3d_canvas.cpp:358 +#: 3d-viewer/3d_canvas.cpp:355 #: 3d-viewer/3d_toolbar.cpp:88 msgid "Move right ->" msgstr "Vers la droite ->" -#: 3d-viewer/3d_canvas.cpp:363 +#: 3d-viewer/3d_canvas.cpp:360 msgid "Move Up ^" msgstr "Vers le haut ^" -#: 3d-viewer/3d_canvas.cpp:368 +#: 3d-viewer/3d_canvas.cpp:365 msgid "Move Down" msgstr "Vers le bas" -#: 3d-viewer/3d_canvas.cpp:574 +#: 3d-viewer/3d_canvas.cpp:571 msgid "3D Image filename:" msgstr "Nom fichier Image 3D:" @@ -12945,6 +12995,54 @@ msgstr "Options d'Affichage" msgid "Page Settings" msgstr "Ajustage opt Page" +#~ msgid "Adjust pads shape, dimensions, layers" +#~ msgstr "" +#~ "Ajuster les caracteristiques par défaut des pads, les dimensions des " +#~ "textes ..." + +#, fuzzy +#~ msgid "PCBNew Board" +#~ msgstr "&Nouveau Circuit Imprimé" +#~ msgid "Save &as..." +#~ msgstr "S&auver Sous..." +#~ msgid "&Save Project" +#~ msgstr "&Sauver Projet" +#~ msgid "Show the current hotkey configuration" +#~ msgstr "Afficher la configuration actuelle des Hotkeys" +#~ msgid "(Re)create" +#~ msgstr "(Re)créer" +#~ msgid "Reload" +#~ msgstr "Recharger" +#~ msgid "&Load Board" +#~ msgstr "Charger Circuit Imprimé" +#~ msgid "Add board to old board" +#~ msgstr "Ajouter un C.I. au C.I. actuel" +#~ msgid "&Previous Version" +#~ msgstr "&Précédente Version" +#~ msgid "&Save Board\tCtrl-S" +#~ msgstr "&Sauver Circuit Imprimé (Ctrl S)" +#~ msgid "Save Board as..." +#~ msgstr "Sauver C.I. sous.." +#~ msgid "Create a board report (footprint report)" +#~ msgstr "Créer un fichier rapport (rapport sur modules)" +#~ msgid "Adjust User Grid" +#~ msgstr "Ajuster Grille utilisateur" +#~ msgid "Adjust size,shape,layers... for pads" +#~ msgstr "Ajuster taille, forme, couches... pour pads" +#~ msgid "Save options in current directory" +#~ msgstr "Sauver les options en répertoire de travail" +#~ msgid "Create &Drill File" +#~ msgstr "Créer &Fichier de Perçage" +#~ msgid "Create &Component File" +#~ msgstr "Créer &Fichier Cmp" +#~ msgid "Recreate .csv file for CvPcb" +#~ msgstr "Recréer le fichier .csv pour CvPcb" +#~ msgid "&Track Operations" +#~ msgstr "Opéra&tions sur Pistes" +#~ msgid "&About PCBnew" +#~ msgstr "&Au sujet de PCBnew" +#~ msgid "P&ostprocess" +#~ msgstr "P&ostprocesseurs" #~ msgid "File" #~ msgstr "Fichier" #~ msgid "" @@ -13006,10 +13104,6 @@ msgstr "Ajustage opt Page" #~ msgid "Sheet properties" #~ msgstr "Propriétés de la feuille" -#, fuzzy -#~ msgid "Set to Current Settings" -#~ msgstr "Ajustages Courants:" - #, fuzzy #~ msgid "Use this Pad Settings as Current" #~ msgstr "" @@ -13398,18 +13492,10 @@ msgstr "Ajustage opt Page" #~ msgstr "Power Out" #~ msgid "Open coll" #~ msgstr "Coll ouvert" -#~ msgid "Open emit" -#~ msgstr "Emetteur ouv." #~ msgid "Order" #~ msgstr "Ordre" #~ msgid "Show Current Hotkey List" #~ msgstr "Afficher Liste Actuelle des Hotkeys" -#~ msgid "Create Hotkey config file" -#~ msgstr "Créer le fichier configuration des Hotkeys" -#~ msgid "Reread Hotkey config file" -#~ msgstr "Relire les fichiers configuration des Hotkeys" -#~ msgid "Edit Hotkey config file" -#~ msgstr "Editer le fichiers configuration des Hotkeys" #~ msgid "Run the text editor and edit the hotkey config file" #~ msgstr "" #~ "Lancer l'éditeur de texte et éditer le fichier de config des hotkeys" @@ -13687,8 +13773,6 @@ msgstr "Ajustage opt Page" #~ msgstr "Rotation Zones" #~ msgid "Block mirroring" #~ msgstr "Bloc Miroir" -#~ msgid "Rotate +" -#~ msgstr "Rotation +" #~ msgid "No component" #~ msgstr "Pas de composants" #~ msgid "Sorting Nets" diff --git a/pcbnew/CMakeLists.txt b/pcbnew/CMakeLists.txt index 758290d5f7..25faf89272 100644 --- a/pcbnew/CMakeLists.txt +++ b/pcbnew/CMakeLists.txt @@ -30,7 +30,7 @@ set(PCBNEW_SRCS # cleaningoptions_dialog.cpp connect.cpp controle.cpp - cotation.cpp + dimension.cpp cross-probing.cpp debug_kbool_key_file_fct.cpp deltrack.cpp diff --git a/pcbnew/class_board_item.cpp b/pcbnew/class_board_item.cpp index cf31678a69..489a311a7c 100644 --- a/pcbnew/class_board_item.cpp +++ b/pcbnew/class_board_item.cpp @@ -292,7 +292,7 @@ const char** BOARD_ITEM::MenuIcon() const break; case TYPE_COTATION: - xpm = add_cotation_xpm; + xpm = add_dimension_xpm; break; case TYPE_MIRE: diff --git a/pcbnew/class_cotation.cpp b/pcbnew/class_dimension.cpp similarity index 100% rename from pcbnew/class_cotation.cpp rename to pcbnew/class_dimension.cpp diff --git a/pcbnew/class_cotation.h b/pcbnew/class_dimension.h similarity index 98% rename from pcbnew/class_cotation.h rename to pcbnew/class_dimension.h index 3eae3cb673..c613cf823f 100644 --- a/pcbnew/class_cotation.h +++ b/pcbnew/class_dimension.h @@ -1,8 +1,8 @@ /*****************************/ /* COTATION class definition */ /*****************************/ -#ifndef COTATION_H -#define COTATION_H +#ifndef DIMENSION_H +#define DIMENSION_H #include "base_struct.h" @@ -130,4 +130,4 @@ public: } }; -#endif // #define COTATION_H +#endif // #define DIMENSION_H diff --git a/pcbnew/cotation.cpp b/pcbnew/dimension.cpp similarity index 100% rename from pcbnew/cotation.cpp rename to pcbnew/dimension.cpp diff --git a/pcbnew/menubar_pcbframe.cpp b/pcbnew/menubar_pcbframe.cpp index d164f0d0f3..8676f8f618 100644 --- a/pcbnew/menubar_pcbframe.cpp +++ b/pcbnew/menubar_pcbframe.cpp @@ -15,165 +15,166 @@ /** * PCBNew mainframe menubar */ -void -WinEDA_PcbFrame::ReCreateMenuBar() +void WinEDA_PcbFrame::ReCreateMenuBar() { wxString text; wxMenuItem* item; wxMenuBar* menuBar = GetMenuBar(); - /** - * Destroy the existing menu bar so it can be rebuilt. This allows - * language changes of the menu text on the fly. - */ + /** + * Destroy the existing menu bar so it can be rebuilt. This allows + * language changes of the menu text on the fly. + */ if( menuBar ) SetMenuBar( NULL ); menuBar = new wxMenuBar(); - - /** - * File Menu - */ + /** + * File Menu + */ wxMenu* filesMenu = new wxMenu; /* New Board */ item = new wxMenuItem( filesMenu, ID_NEW_BOARD, _( "&New" ), - _( "Clear current board and initialize a new one" )); + _( "Clear current board and initialize a new one" ) ); item->SetBitmap( new_xpm ); filesMenu->Append( item ); /* Load Board */ item = new wxMenuItem( filesMenu, ID_LOAD_FILE, _( "&Open" ), - _( "Delete current board and load new board" ) ); + _( "Delete current board and load new board" ) ); item->SetBitmap( open_xpm ); filesMenu->Append( item ); /* Load Recent submenu */ wxMenu* openRecentMenu = new wxMenu(); wxGetApp().m_fileHistory.AddFilesToMenu( openRecentMenu ); - filesMenu->AppendSubMenu( openRecentMenu, _( "Open &Recent" ), - _("Open a recent opened document")); + ADD_MENUITEM_WITH_HELP_AND_SUBMENU( filesMenu, openRecentMenu, + -1, _( "Open &Recent" ), + _( "Open a recent opened board" ), open_project_xpm ); + + + /* PCBNew Board */ + item = new wxMenuItem( filesMenu, ID_APPEND_FILE, _( "&Append Board" ), + _( "Append a other PCBNew board to the current loaded board" ) ); + item->SetBitmap( import_xpm ); + filesMenu->Append( item ); + + /* Separator */ + filesMenu->AppendSeparator(); /* Save */ item = new wxMenuItem( filesMenu, ID_SAVE_BOARD, - _( "&Save" ), - _( "Save current board" ) ); + _( "&Save" ), + _( "Save current board" ) ); item->SetBitmap( save_xpm ); filesMenu->Append( item ); /* Save As */ item = new wxMenuItem( filesMenu, ID_SAVE_BOARD_AS, - _( "Save as..." ), - _( "Save the current board as.." ) ); + _( "Save as..." ), + _( "Save the current board as.." ) ); item->SetBitmap( save_as_xpm ); filesMenu->Append( item ); /* Separator */ filesMenu->AppendSeparator(); - /* Rescue */ - item = new wxMenuItem( filesMenu, ID_MENU_RECOVER_BOARD, _( "&Rescue" ), - _( "Clear old board and get last rescue file" ) ); - item->SetBitmap( hammer_xpm ); - filesMenu->Append( item ); - /* Revert */ item = new wxMenuItem( filesMenu, ID_MENU_READ_LAST_SAVED_VERSION_BOARD, - _( "&Revert" ), - _( "Clear old board and get old version of board" ) ); + _( "&Revert" ), + _( "Clear board and get previous saved version of board" ) ); item->SetBitmap( jigsaw_xpm ); filesMenu->Append( item ); + /* Rescue */ + item = new wxMenuItem( filesMenu, ID_MENU_RECOVER_BOARD, _( "&Rescue" ), + _( "Clear old board and get last rescue file" ) ); + item->SetBitmap( hammer_xpm ); + filesMenu->Append( item ); + /* Separator */ filesMenu->AppendSeparator(); - /* Fabrication Outputs submenu */ wxMenu* fabricationOutputsMenu = new wxMenu; item = new wxMenuItem( fabricationOutputsMenu, ID_PCB_GEN_POS_MODULES_FILE, - _( "&Modules Position" ), - _( "Generate modules position file for pick and place" ) ); + _( "&Modules Position" ), + _( "Generate modules position file for pick and place" ) ); item->SetBitmap( post_compo_xpm ); fabricationOutputsMenu->Append( item ); item = new wxMenuItem( fabricationOutputsMenu, ID_PCB_GEN_DRILL_FILE, - _( "&Drill File" ), - _( "Generate excellon2 drill file" ) ); + _( "&Drill File" ), + _( "Generate excellon2 drill file" ) ); item->SetBitmap( post_drill_xpm ); fabricationOutputsMenu->Append( item ); /* Component File */ item = new wxMenuItem( fabricationOutputsMenu, ID_PCB_GEN_CMP_FILE, - _( "&Component File" ), - _( "(Re)create components file for CvPcb" ) ); + _( "&Component File" ), + _( "(Re)create components file for CvPcb" ) ); item->SetBitmap( save_cmpstuff_xpm ); fabricationOutputsMenu->Append( item ); /* BOM File */ item = new wxMenuItem( fabricationOutputsMenu, ID_PCB_GEN_BOM_FILE_FROM_BOARD, - _( "&BOM File" ), - _( "(Re)create bill of materials file for CvPCB" ) ); + _( "&BOM File" ), + _( "Create a bill of materials from schematic" ) ); item->SetBitmap( tools_xpm ); fabricationOutputsMenu->Append( item ); /* Fabrications Outputs submenu append */ - filesMenu->AppendSubMenu( fabricationOutputsMenu, - _( "Fabrication Outputs "), - _( "Generate files for fabrication" ) ); + ADD_MENUITEM_WITH_HELP_AND_SUBMENU( filesMenu, fabricationOutputsMenu, + -1, _( "Fabrication Outputs" ), + _( "Generate files for fabrication" ), export_xpm ); /* Import submenu */ wxMenu* submenuImport = new wxMenu(); - /* PCBNew Board */ - item = new wxMenuItem( submenuImport, ID_APPEND_FILE, _( "PCBNew Board" ), - _( "Append a other PCBNew board to the current loaded board" ) ); - item->SetBitmap( pcbnew_xpm ); - submenuImport->Append( item ); - /* Specctra Session */ item = new wxMenuItem( submenuImport, ID_GEN_IMPORT_SPECCTRA_SESSION, - _( "&Specctra Session" ), - _( "Import a routed \"Specctra Session\" (*.ses) file" ) ); + _( "&Specctra Session" ), + _( "Import a routed \"Specctra Session\" (*.ses) file" ) ); item->SetBitmap( import_xpm ); // @todo need better bitmap submenuImport->Append( item ); - /** - * would be implemented in WinEDA_PcbFrame::ImportSpecctraDesign() in - * specctra_import.cpp - * item = new wxMenuItem(submenuImport, ID_GEN_IMPORT_SPECCTRA_DESIGN, - * _("&Specctra Design"), _("Import a \"Specctra Design\" (*.dsn) file") ); - * item->SetBitmap(export_xpm); // @todo need better bitmap - * submenuImport->Append(item); - */ + /** + * would be implemented in WinEDA_PcbFrame::ImportSpecctraDesign() in + * specctra_import.cpp + * item = new wxMenuItem(submenuImport, ID_GEN_IMPORT_SPECCTRA_DESIGN, + * _("&Specctra Design"), _("Import a \"Specctra Design\" (*.dsn) file") ); + * item->SetBitmap(export_xpm); // @todo need better bitmap + * submenuImport->Append(item); + */ ADD_MENUITEM_WITH_HELP_AND_SUBMENU( filesMenu, submenuImport, ID_GEN_IMPORT_FILE, _( "Import" ), _( "Import files" ), import_xpm ); - /* Export submenu */ wxMenu* submenuexport = new wxMenu(); /* Specctra DSN */ item = new wxMenuItem( submenuexport, ID_GEN_EXPORT_SPECCTRA, - _( "&Specctra DSN" ), - _( "Export the current board to a \"Specctra DSN\" file" ) ); + _( "&Specctra DSN" ), + _( "Export the current board to a \"Specctra DSN\" file" ) ); item->SetBitmap( export_xpm ); submenuexport->Append( item ); /* Export GenCAD Format */ item = new wxMenuItem( submenuexport, ID_GEN_EXPORT_FILE_GENCADFORMAT, - _( "&GenCAD" ), _( "Export GenCAD Format" ) ); + _( "&GenCAD" ), _( "Export GenCAD Format" ) ); item->SetBitmap( export_xpm ); submenuexport->Append( item ); /* Module Report */ item = new wxMenuItem( submenuexport, ID_GEN_EXPORT_FILE_MODULE_REPORT, - _( "&Module Report" ), - _( "Create a report of all modules on the current board" ) ); + _( "&Module Report" ), + _( "Create a report of all modules on the current board" ) ); item->SetBitmap( tools_xpm ); submenuexport->Append( item ); ADD_MENUITEM_WITH_HELP_AND_SUBMENU( filesMenu, submenuexport, @@ -185,19 +186,19 @@ WinEDA_PcbFrame::ReCreateMenuBar() /* Print */ item = new wxMenuItem( filesMenu, ID_GEN_PRINT, _( "P&rint" ), - _( "Print pcb board" ) ); + _( "Print pcb board" ) ); item->SetBitmap( print_button ); filesMenu->Append( item ); /* Print SVG */ item = new wxMenuItem( filesMenu, ID_GEN_PLOT_SVG, _( "Print S&VG" ), - _( "Plot board in Scalable Vector Graphics format" ) ); + _( "Plot board in Scalable Vector Graphics format" ) ); item->SetBitmap( print_button ); filesMenu->Append( item ); /* Plot */ item = new wxMenuItem( filesMenu, ID_GEN_PLOT, _( "&Plot" ), - _( "Plot board in HPGL, PostScript or Gerber RS-274X format)" ) ); + _( "Plot board in HPGL, PostScript or Gerber RS-274X format)" ) ); item->SetBitmap( plot_xpm ); filesMenu->Append( item ); @@ -205,13 +206,14 @@ WinEDA_PcbFrame::ReCreateMenuBar() filesMenu->AppendSeparator(); wxMenu* submenuarchive = new wxMenu(); item = new wxMenuItem( submenuarchive, ID_MENU_ARCHIVE_NEW_MODULES, - _( "Add New Footprints" ), - _( "Archive new footprints only in a library (keep other footprints in this lib)" ) ); + _( "Add New Footprints" ), + _( + "Archive new footprints only in a library (keep other footprints in this lib)" ) ); item->SetBitmap( library_update_xpm ); submenuarchive->Append( item ); item = new wxMenuItem( submenuarchive, ID_MENU_ARCHIVE_ALL_MODULES, - _( "Create Footprint Archive" ), - _( "Archive all footprints in a library(old lib will be deleted)" ) ); + _( "Create Footprint Archive" ), + _( "Archive all footprints in a library(old lib will be deleted)" ) ); item->SetBitmap( library_xpm ); submenuarchive->Append( item ); ADD_MENUITEM_WITH_HELP_AND_SUBMENU( filesMenu, submenuarchive, @@ -223,20 +225,19 @@ WinEDA_PcbFrame::ReCreateMenuBar() /* Exit */ filesMenu->AppendSeparator(); item = new wxMenuItem( filesMenu, ID_EXIT, _( "&Quit" ), - _( "Quit PCBNew" ) ); + _( "Quit PCBNew" ) ); item->SetBitmap( exit_xpm ); filesMenu->Append( item ); - - /** - * Edit menu - */ + /** + * Edit menu + */ wxMenu* editMenu = new wxMenu; /* Undo */ /* TODO add Undo hotkey */ - item = new wxMenuItem( editMenu, ID_UNDO_BUTT, _( "Undo"), + item = new wxMenuItem( editMenu, ID_UNDO_BUTT, _( "Undo" ), _( "Undo last edition" ), wxITEM_NORMAL ); item->SetBitmap( undo_xpm ); editMenu->Append( item ); @@ -252,9 +253,10 @@ WinEDA_PcbFrame::ReCreateMenuBar() editMenu->AppendSeparator(); /* Find */ - text = AddHotkeyName( _( "&Find..." ), s_Pcbnew_Editor_Hokeys_Descr, HK_FIND_ITEM); + text = AddHotkeyName( _( "&Find..." ), s_Pcbnew_Editor_Hokeys_Descr, HK_FIND_ITEM ); item = new wxMenuItem( editMenu, ID_FIND_ITEMS, text, - _("Find components and text in current loaded board") ); + _( "Find components and text in current loaded board" ) ); + item->SetBitmap( find_xpm ); editMenu->Append( item ); /* Separator */ @@ -262,34 +264,34 @@ WinEDA_PcbFrame::ReCreateMenuBar() /* Global Deletions */ item = new wxMenuItem( editMenu, ID_PCB_GLOBAL_DELETE, - _( "Global &Deletions" ), - _( "Delete tracks, modules, texts... on board" ) ); + _( "Global &Deletions" ), + _( "Delete tracks, modules, texts... on board" ) ); item->SetBitmap( general_deletions_xpm ); editMenu->Append( item ); /* Tracks */ item = new wxMenuItem( editMenu, ID_MENU_PCB_CLEAN, - _( "&Tracks" ), - _( "Clean stubs, vias, delete break points, or connect dangling tracks to pads and vias" ) ); + _( "&Tracks" ), + _( + "Clean stubs, vias, delete break points, or connect dangling tracks to pads and vias" ) ); item->SetBitmap( delete_body_xpm ); editMenu->Append( item ); /* Swap Layers */ item = new wxMenuItem( editMenu, ID_MENU_PCB_SWAP_LAYERS, - _( "&Swap Layers" ), - _( "Swap tracks on copper layers or drawings on others layers" ) ); + _( "&Swap Layers" ), + _( "Swap tracks on copper layers or drawings on others layers" ) ); item->SetBitmap( swap_layer_xpm ); editMenu->Append( item ); - /** * View menu */ wxMenu* viewMenu = new wxMenu; /* Zoom in */ - text = AddHotkeyName( _( "Zoom in" ), s_Pcbnew_Editor_Hokeys_Descr, HK_ZOOM_IN); + text = AddHotkeyName( _( "Zoom in" ), s_Pcbnew_Editor_Hokeys_Descr, HK_ZOOM_IN ); item = new wxMenuItem( viewMenu, ID_ZOOM_IN, text, _( "Zoom in" ), wxITEM_NORMAL ); item->SetBitmap( zoom_in_xpm ); @@ -297,7 +299,7 @@ WinEDA_PcbFrame::ReCreateMenuBar() /* Zoom out */ text = AddHotkeyName( _( "Zoom out" ), s_Pcbnew_Editor_Hokeys_Descr, - HK_ZOOM_OUT ); + HK_ZOOM_OUT ); item = new wxMenuItem( viewMenu, ID_ZOOM_OUT, text, _( "Zoom out" ), wxITEM_NORMAL ); item->SetBitmap( zoom_out_xpm ); @@ -305,7 +307,7 @@ WinEDA_PcbFrame::ReCreateMenuBar() /* Zoom auto */ text = AddHotkeyName( _( "Zoom auto" ), s_Pcbnew_Editor_Hokeys_Descr, - HK_ZOOM_AUTO ); + HK_ZOOM_AUTO ); item = new wxMenuItem( viewMenu, ID_ZOOM_PAGE, text, _( "Zoom auto" ), wxITEM_NORMAL ); item->SetBitmap( zoom_auto_xpm ); @@ -315,7 +317,7 @@ WinEDA_PcbFrame::ReCreateMenuBar() /* Redraw view */ text = AddHotkeyName( _( "Redraw view" ), s_Pcbnew_Editor_Hokeys_Descr, - HK_ZOOM_REDRAW ); + HK_ZOOM_REDRAW ); item = new wxMenuItem( viewMenu, ID_ZOOM_REDRAW, text, _( "Zoom auto" ), wxITEM_NORMAL ); item->SetBitmap( zoom_redraw_xpm ); @@ -326,47 +328,46 @@ WinEDA_PcbFrame::ReCreateMenuBar() /* List of Nets */ item = new wxMenuItem( viewMenu, ID_MENU_LIST_NETS, _( "&List Nets" ), - _( "View a list of nets with names and id's" ) ); + _( "View a list of nets with names and id's" ) ); item->SetBitmap( tools_xpm ); viewMenu->Append( item ); /* 3D Display */ item = new wxMenuItem( viewMenu, ID_MENU_PCB_SHOW_3D_FRAME, - _( "3D Display" ), _( "Show board in the 3D viewer" ) ); + _( "3D Display" ), _( "Show board in the 3D viewer" ) ); item->SetBitmap( show_3d_xpm ); viewMenu->Append( item ); - - /** - * Preferences and configuration - */ + /** + * Preferences and configuration + */ wxMenu* configmenu = new wxMenu; /* Library */ item = new wxMenuItem( configmenu, ID_CONFIG_REQ, _( "&Library" ), - _( "Setting libraries, directories and others..." ) ); + _( "Setting libraries, directories and others..." ) ); item->SetBitmap( library_xpm ); configmenu->Append( item ); /* Colors and Visibility */ item = new wxMenuItem( configmenu, ID_COLORS_SETUP, - _( "&Colors and Visibility" ), - _( "Select colors and visibility of layers and some items" ) ); + _( "&Colors and Visibility" ), + _( "Select colors and visibility of layers and some items" ) ); item->SetBitmap( palette_xpm ); configmenu->Append( item ); /* General */ item = new wxMenuItem( configmenu, ID_OPTIONS_SETUP, _( "&General" ), - _( "Select general options for PCBnew" ) ); + _( "Select general options for PCBnew" ) ); item->SetBitmap( preference_xpm ); configmenu->Append( item ); /* Display */ item = new wxMenuItem( configmenu, ID_PCB_DISPLAY_OPTIONS_SETUP, - _( "&Display" ), - _( "Select how items (pads, tracks texts ... ) are displayed" ) ); + _( "&Display" ), + _( "Select how items (pads, tracks texts ... ) are displayed" ) ); item->SetBitmap( display_options_xpm ); configmenu->Append( item ); @@ -375,39 +376,43 @@ WinEDA_PcbFrame::ReCreateMenuBar() /* Grid */ item = new wxMenuItem( dimensionsMenu, ID_PCB_USER_GRID_SETUP, _( "Grid" ), - _( "Adjust user grid dimensions" ) ); + _( "Adjust user grid dimensions" ) ); item->SetBitmap( grid_xpm ); dimensionsMenu->Append( item ); /* Text and Drawings */ item = new wxMenuItem( dimensionsMenu, ID_PCB_DRAWINGS_WIDTHS_SETUP, - _( "Texts and Drawings" ), - _( "Adjust dimensions for texts and drawings" ) ); + _( "Texts and Drawings" ), + _( "Adjust dimensions for texts and drawings" ) ); item->SetBitmap( options_text_xpm ); dimensionsMenu->Append( item ); /* Pads */ item = new wxMenuItem( dimensionsMenu, ID_PCB_PAD_SETUP, _( "Pads" ), - _( "Adjust pads shape, dimensions, layers" ) ); + _( "Adjust default pads caracteristics" ) ); item->SetBitmap( pad_xpm ); dimensionsMenu->Append( item ); - /* Pads Mask Clearance */ + /* Pads Mask Clearance */ item = new wxMenuItem( dimensionsMenu, ID_PCB_MASK_CLEARANCE, - _( "Pads Mask Clearance" ), - _( "Adjust the global clearance between pads and the solder resist mask" ) ); + _( "Pads Mask Clearance" ), + _( "Adjust the global clearance between pads and the solder resist mask" ) ); item->SetBitmap( pad_xpm ); dimensionsMenu->Append( item ); - /* Save */ + /* Save dimension preferences */ dimensionsMenu->AppendSeparator(); item = new wxMenuItem( dimensionsMenu, ID_CONFIG_SAVE, _( "&Save" ), - _( "Save dimension preferences" ) ); + _( "Save dimension preferences" ) ); item->SetBitmap( save_xpm ); dimensionsMenu->Append( item ); - configmenu->AppendSubMenu( dimensionsMenu, _( "Di&mensions" ), - _( "Global dimensions preferences" )); + + /* append dimension menu to config menu */ + ADD_MENUITEM_WITH_HELP_AND_SUBMENU( configmenu, dimensionsMenu, + -1, _( "Di&mensions" ), + _( "Global dimensions preferences" ), + add_dimension_xpm ); /* Language submenu */ wxGetApp().AddMenuLanguageList( configmenu ); @@ -420,59 +425,56 @@ WinEDA_PcbFrame::ReCreateMenuBar() /* Save Preferences */ item = new wxMenuItem( configmenu, ID_CONFIG_SAVE, _( "&Save Preferences" ), - _( "Save application preferences" ) ); + _( "Save application preferences" ) ); item->SetBitmap( save_setup_xpm ); configmenu->Append( item ); /* Read Preferences */ item = new wxMenuItem( configmenu, ID_CONFIG_READ, _( "&Read Preferences" ), - _( "Read application preferences" ) ); + _( "Read application preferences" ) ); item->SetBitmap( read_setup_xpm ); configmenu->Append( item ); - - /** - * Design Rules menu - */ + /** + * Design Rules menu + */ wxMenu* designRulesMenu = new wxMenu; /* Design Rules */ item = new wxMenuItem( designRulesMenu, ID_MENU_PCB_SHOW_DESIGN_RULES_DIALOG, - _( "Design Rules" ), - _( "Open the design rules dialog editor" ) ); + _( "Design Rules" ), + _( "Open the design rules dialog editor" ) ); item->SetBitmap( hammer_xpm ); designRulesMenu->Append( item ); /* Layers Setup */ item = new wxMenuItem( configmenu, ID_PCB_LAYERS_SETUP, _( "&Layers Setup" ), - _( "Enable and set properties of layers" ) ); + _( "Enable and set properties of layers" ) ); item->SetBitmap( copper_layers_setup_xpm ); designRulesMenu->Append( item ); - /** * Help menu */ wxMenu* helpMenu = new wxMenu; item = new wxMenuItem( helpMenu, ID_GENERAL_HELP, _( "&Contents" ), - _( "Open the PCBnew manual" ) ); + _( "Open the PCBnew manual" ) ); item->SetBitmap( help_xpm ); helpMenu->Append( item ); item = new wxMenuItem( helpMenu, ID_KICAD_ABOUT, _( "&About" ), - _( "About PCBnew printed circuit board designer" ) ); + _( "About PCBnew printed circuit board designer" ) ); item->SetBitmap( info_xpm ); helpMenu->Append( item ); - /** * Append all menus to the menuBar */ menuBar->Append( filesMenu, _( "&File" ) ); - menuBar->Append( editMenu, _( "&Edit") ); + menuBar->Append( editMenu, _( "&Edit" ) ); menuBar->Append( viewMenu, _( "&View" ) ); menuBar->Append( configmenu, _( "&Preferences" ) ); menuBar->Append( designRulesMenu, _( "&Design Rules" ) ); @@ -481,4 +483,3 @@ WinEDA_PcbFrame::ReCreateMenuBar() /* Associate the menu bar with the frame */ SetMenuBar( menuBar ); } - diff --git a/pcbnew/tool_pcb.cpp b/pcbnew/tool_pcb.cpp index 04a054c275..0c0a3741f7 100644 --- a/pcbnew/tool_pcb.cpp +++ b/pcbnew/tool_pcb.cpp @@ -458,7 +458,7 @@ void WinEDA_PcbFrame::ReCreateVToolbar() m_VToolBar->AddSeparator(); m_VToolBar->AddTool( ID_PCB_COTATION_BUTT, wxEmptyString, - wxBitmap( add_cotation_xpm ), + wxBitmap( add_dimension_xpm ), _( "Add dimension" ), wxITEM_CHECK ); m_VToolBar->AddTool( ID_PCB_MIRE_BUTT, wxEmptyString,