From 485c92d4fe785b8c5032a378478fabf9d0c4f076 Mon Sep 17 00:00:00 2001 From: charras Date: Mon, 25 Aug 2008 12:28:03 +0000 Subject: [PATCH] Modified recent change on svn change: "PCB edge always printed when PCB edge layer not selected" was incorrect for eeschema and gerbview solved bug 2070228 --- bitmaps/CMakeLists.txt | 2 +- demos/interf_u/interf_u.cmp | 50 +- demos/interf_u/interf_u.net | 1267 ++++++++++++----------------------- demos/video/video.net | 598 ++++++++--------- internat/fr/kicad.mo | Bin 158822 -> 158930 bytes internat/fr/kicad.po | 859 ++++++++++++++++++++---- share/dialog_print.cpp | 115 ++-- share/dialog_print.h | 8 +- share/dialog_print.pjd | 190 +++++- share/wxprint.cpp | 31 +- 10 files changed, 1704 insertions(+), 1416 deletions(-) diff --git a/bitmaps/CMakeLists.txt b/bitmaps/CMakeLists.txt index c45cb20120..1aeb22886e 100644 --- a/bitmaps/CMakeLists.txt +++ b/bitmaps/CMakeLists.txt @@ -20,7 +20,7 @@ foreach(LOOP_VAR ${BITMAP_SRCS}) set(CPP_BITMAP "${XPM_CPP_PATH}/${BASENAME}.cpp") add_custom_command( OUTPUT ${CPP_BITMAP} - COMMAND cmake -E copy '${PATH}/${BASENAME}.xpm' '${CPP_BITMAP}' + COMMAND cmake -E copy "${PATH}/${BASENAME}.xpm" "${CPP_BITMAP}" DEPENDS ${BASENAME}.xpm) list(APPEND CPP_BITMAPS ${CPP_BITMAP}) set_source_files_properties(${CPP_BITMAP} PROPERTIES COMPILE_FLAGS -DXPMMAIN) diff --git a/demos/interf_u/interf_u.cmp b/demos/interf_u/interf_u.cmp index a083512aa2..fd38e2e546 100644 --- a/demos/interf_u/interf_u.cmp +++ b/demos/interf_u/interf_u.cmp @@ -1,168 +1,168 @@ -Cmp-Mod V01 Created by Cvpcb (20080313-r890) date = 22/3/2008-09:05:19 +Cmp-Mod V01 Created by Cvpcb (20080731.r1175 date = 1/8/2008-07:52:43 BeginCmp -TimeStamp = 322D3011; +TimeStamp = /322D3011; Reference = BUS1; ValeurCmp = BUSPC; IdModule = BUS_PC; EndCmp BeginCmp -TimeStamp = 32307DE2; +TimeStamp = /32307DE2; Reference = C1; ValeurCmp = 47uF; IdModule = CP6; EndCmp BeginCmp -TimeStamp = 32307ECF; +TimeStamp = /32307ECF; Reference = C2; ValeurCmp = 47pF; IdModule = C1; EndCmp BeginCmp -TimeStamp = 32307ED4; +TimeStamp = /32307ED4; Reference = C3; ValeurCmp = 47pF; IdModule = C1; EndCmp BeginCmp -TimeStamp = 32307DCF; +TimeStamp = /32307DCF; Reference = C4; ValeurCmp = 47uF; IdModule = CP6; EndCmp BeginCmp -TimeStamp = 32307DCA; +TimeStamp = /32307DCA; Reference = C5; ValeurCmp = 47uF; IdModule = CP6; EndCmp BeginCmp -TimeStamp = 32307DC0; +TimeStamp = /32307DC0; Reference = C6; ValeurCmp = 47uF; IdModule = CP6; EndCmp BeginCmp -TimeStamp = 322D32AC; +TimeStamp = /322D32AC; Reference = D1; ValeurCmp = LED; IdModule = LEDV; EndCmp BeginCmp -TimeStamp = 322D32BE; +TimeStamp = /322D32BE; Reference = D2; ValeurCmp = LED; IdModule = LEDV; EndCmp BeginCmp -TimeStamp = 32568D1E; +TimeStamp = /32568D1E; Reference = JP1; ValeurCmp = CONN_8X2; IdModule = pin_array_8x2; EndCmp BeginCmp -TimeStamp = 3256759C; +TimeStamp = /3256759C; Reference = P1; ValeurCmp = DB25FEMELLE; IdModule = DB25FC; EndCmp BeginCmp -TimeStamp = 32307EA1; +TimeStamp = /32307EA1; Reference = R1; ValeurCmp = 100K; IdModule = R3; EndCmp BeginCmp -TimeStamp = 32307EAA; +TimeStamp = /32307EAA; Reference = R2; ValeurCmp = 1K; IdModule = R3; EndCmp BeginCmp -TimeStamp = 324002E6; +TimeStamp = /324002E6; Reference = R3; ValeurCmp = 10K; IdModule = R3; EndCmp BeginCmp -TimeStamp = 322D3295; +TimeStamp = /322D3295; Reference = R4; ValeurCmp = 330; IdModule = R3; EndCmp BeginCmp -TimeStamp = 322D32A0; +TimeStamp = /322D32A0; Reference = R5; ValeurCmp = 330; IdModule = R3; EndCmp BeginCmp -TimeStamp = 325679C1; +TimeStamp = /325679C1; Reference = RR1; ValeurCmp = 9x1K; IdModule = r_pack9; EndCmp BeginCmp -TimeStamp = 322D31F4; +TimeStamp = /322D31F4; Reference = U1; ValeurCmp = 74LS245; IdModule = 20dip300; EndCmp BeginCmp -TimeStamp = 322D35B4; +TimeStamp = /322D35B4; Reference = U2; ValeurCmp = 74LS688; IdModule = 20dip300; EndCmp BeginCmp -TimeStamp = 322D31CA; +TimeStamp = /322D31CA; Reference = U3; ValeurCmp = 74LS541; IdModule = 20dip300; EndCmp BeginCmp -TimeStamp = 3240023F; +TimeStamp = /3240023F; Reference = U5; ValeurCmp = 628128; IdModule = 32dip600; EndCmp BeginCmp -TimeStamp = 322D321C; +TimeStamp = /322D321C; Reference = U8; ValeurCmp = EP600; IdModule = 24dip300; EndCmp BeginCmp -TimeStamp = 322D32FA; +TimeStamp = /322D32FA; Reference = U9; ValeurCmp = 4003APG120; IdModule = PGA120; EndCmp BeginCmp -TimeStamp = 32307EC0; +TimeStamp = /32307EC0; Reference = X1; ValeurCmp = 8MHz; IdModule = HC-18UH; diff --git a/demos/interf_u/interf_u.net b/demos/interf_u/interf_u.net index 40f2782184..0e260b1b54 100644 --- a/demos/interf_u/interf_u.net +++ b/demos/interf_u/interf_u.net @@ -1,460 +1,442 @@ -# EESchema Netlist Version 1.1 created 15/5/2008-12:09:21 +# EESchema Netlist Version 1.1 created 1/8/2008-07:52:43 ( - ( /32568D1E $noname JP1 CONN_8X2 {Lib=CONN_8X2} - ( 1 GND ) - ( 2 /REF10 ) - ( 3 GND ) - ( 4 /REF11 ) - ( 5 GND ) - ( 6 /REF7 ) - ( 7 GND ) - ( 8 /REF9 ) - ( 9 GND ) - ( 10 /REF6 ) - ( 11 GND ) - ( 12 /REF8 ) - ( 13 GND ) - ( 14 /REF4 ) - ( 15 GND ) - ( 16 /REF5 ) + ( /322D3011 BUS_PC BUS1 BUSPC + ( 1 GND ) + ( 2 /PC-RST ) + ( 3 VCC ) + ( 4 ? ) + ( 5 ? ) + ( 6 ? ) + ( 7 ? ) + ( 8 ? ) + ( 9 ? ) + ( 10 ? ) + ( 11 ? ) + ( 12 ? ) + ( 13 /PC-IOW ) + ( 14 /PC-IOR ) + ( 15 ? ) + ( 16 ? ) + ( 17 ? ) + ( 18 ? ) + ( 19 ? ) + ( 20 ? ) + ( 21 ? ) + ( 22 ? ) + ( 23 ? ) + ( 24 ? ) + ( 25 ? ) + ( 26 ? ) + ( 27 ? ) + ( 28 ? ) + ( 29 VCC ) + ( 30 ? ) + ( 31 GND ) + ( 32 ? ) + ( 33 /PC-DB7 ) + ( 34 /PC-DB6 ) + ( 35 /PC-DB5 ) + ( 36 /PC-DB4 ) + ( 37 /PC-DB3 ) + ( 38 /PC-DB2 ) + ( 39 /PC-DB1 ) + ( 40 /PC-DB0 ) + ( 41 ? ) + ( 42 /PC-AEN ) + ( 43 ? ) + ( 44 ? ) + ( 45 ? ) + ( 46 ? ) + ( 47 ? ) + ( 48 ? ) + ( 49 ? ) + ( 50 ? ) + ( 51 /PC-A11 ) + ( 52 /PC-A10 ) + ( 53 /PC-A9 ) + ( 54 /PC-A8 ) + ( 55 /PC-A7 ) + ( 56 /PC-A6 ) + ( 57 /PC-A5 ) + ( 58 /PC-A4 ) + ( 59 /PC-A3 ) + ( 60 /PC-A2 ) + ( 61 /PC-A1 ) + ( 62 /PC-A0 ) ) - ( /325679C1 $noname RR1 9x1K {Lib=RR9} - ( 1 VCC ) - ( 2 /REF5 ) - ( 3 /REF4 ) - ( 4 /REF8 ) - ( 5 /REF6 ) - ( 6 /REF9 ) - ( 7 /REF7 ) - ( 8 /REF11 ) - ( 9 /REF10 ) - ( 10 ? ) + ( /32307DE2 CP6 C1 47uF + ( 1 VCC ) + ( 2 GND ) ) - ( /3256759C $noname P1 DB25FEMELLE {Lib=DB25} - ( 1 /STROBE ) - ( 2 /BIT0 ) - ( 3 /BIT1 ) - ( 4 /BIT2 ) - ( 5 /BIT3 ) - ( 6 /BIT4 ) - ( 7 /BIT5 ) - ( 8 /BIT6 ) - ( 9 /BIT7 ) - ( 10 /ACK ) - ( 11 /BUST+ ) - ( 12 /PE+ ) - ( 13 /SLCT+ ) - ( 14 /AUTOFD- ) - ( 15 /ERROR- ) - ( 16 /INIT- ) - ( 17 /SLCTIN- ) - ( 18 GND ) - ( 19 GND ) - ( 20 GND ) - ( 21 GND ) - ( 22 GND ) - ( 23 GND ) - ( 24 GND ) - ( 25 GND ) + ( /32307ECF C1 C2 47pF + ( 1 N-000005 ) + ( 2 GND ) ) - ( /324002E6 $noname R3 10K {Lib=R} - ( 1 N-000114 ) - ( 2 VCC ) + ( /32307ED4 C1 C3 47pF + ( 1 N-000004 ) + ( 2 GND ) ) - ( /3240023F $noname U5 628128 {Lib=628128} - ( 2 /MA16 ) - ( 3 /MA14 ) - ( 4 /MA12 ) - ( 5 /MA7 ) - ( 6 /MA6 ) - ( 7 /MA5 ) - ( 8 /MA4 ) - ( 9 /MA3 ) - ( 10 /MA2 ) - ( 11 /MA1 ) - ( 12 /MA0 ) - ( 13 /MD0 ) - ( 14 /MD1 ) - ( 15 /MD2 ) - ( 16 GND ) - ( 17 /MD3 ) - ( 18 /MD4 ) - ( 19 /MD5 ) - ( 20 /MD6 ) - ( 21 /MD7 ) - ( 22 /CS1- ) - ( 23 /MA10 ) - ( 24 /OE- ) - ( 25 /MA11 ) - ( 26 /MA9 ) - ( 27 /MA8 ) - ( 28 /MA13 ) - ( 29 /WR- ) - ( 30 N-000114 ) - ( 31 /MA15 ) - ( 32 VCC ) + ( /32307DCF CP6 C4 47uF + ( 1 VCC ) + ( 2 GND ) ) - ( /32307ED4 $noname C3 47pF {Lib=C} - ( 1 N-000004 ) - ( 2 GND ) + ( /32307DCA CP6 C5 47uF + ( 1 VCC ) + ( 2 GND ) ) - ( /32307ECF $noname C2 47pF {Lib=C} - ( 1 N-000005 ) - ( 2 GND ) + ( /32307DC0 CP6 C6 47uF + ( 1 VCC ) + ( 2 GND ) ) - ( /32307EC0 $noname X1 8MHz {Lib=CRYSTAL} - ( 1 N-000005 ) - ( 2 N-000004 ) + ( /322D32AC LEDV D1 LED + ( 1 N-000006 ) + ( 2 GND ) ) - ( /32307EAA $noname R2 1K {Lib=R} - ( 1 /8MH-OUT ) - ( 2 N-000004 ) + ( /322D32BE LEDV D2 LED + ( 1 N-000007 ) + ( 2 GND ) ) - ( /32307EA1 $noname R1 100K {Lib=R} - ( 1 N-000004 ) - ( 2 N-000005 ) + ( /32568D1E pin_array_8x2 JP1 CONN_8X2 + ( 1 GND ) + ( 2 /REF10 ) + ( 3 GND ) + ( 4 /REF11 ) + ( 5 GND ) + ( 6 /REF7 ) + ( 7 GND ) + ( 8 /REF9 ) + ( 9 GND ) + ( 10 /REF6 ) + ( 11 GND ) + ( 12 /REF8 ) + ( 13 GND ) + ( 14 /REF4 ) + ( 15 GND ) + ( 16 /REF5 ) ) - ( /32307DE2 $noname C1 47uF {Lib=CP} - ( 1 VCC ) - ( 2 GND ) + ( /3256759C DB25FC P1 DB25FEMELLE + ( 1 /STROBE ) + ( 2 /BIT0 ) + ( 3 /BIT1 ) + ( 4 /BIT2 ) + ( 5 /BIT3 ) + ( 6 /BIT4 ) + ( 7 /BIT5 ) + ( 8 /BIT6 ) + ( 9 /BIT7 ) + ( 10 /ACK ) + ( 11 /BUST+ ) + ( 12 /PE+ ) + ( 13 /SLCT+ ) + ( 14 /AUTOFD- ) + ( 15 /ERROR- ) + ( 16 /INIT- ) + ( 17 /SLCTIN- ) + ( 18 GND ) + ( 19 GND ) + ( 20 GND ) + ( 21 GND ) + ( 22 GND ) + ( 23 GND ) + ( 24 GND ) + ( 25 GND ) ) - ( /32307DCF $noname C4 47uF {Lib=CP} - ( 1 VCC ) - ( 2 GND ) + ( /32307EA1 R3 R1 100K + ( 1 N-000004 ) + ( 2 N-000005 ) ) - ( /32307DCA $noname C5 47uF {Lib=CP} - ( 1 VCC ) - ( 2 GND ) + ( /32307EAA R3 R2 1K + ( 1 /8MH-OUT ) + ( 2 N-000004 ) ) - ( /32307DC0 $noname C6 47uF {Lib=CP} - ( 1 VCC ) - ( 2 GND ) + ( /324002E6 R3 R3 10K + ( 1 N-000114 ) + ( 2 VCC ) ) - ( /322D35B4 $noname U2 74LS688 {Lib=74LS688} - ( 1 /PC-AEN ) - ( 2 /PC-A5 ) - ( 3 /REF5 ) - ( 4 /PC-A8 ) - ( 5 /REF8 ) - ( 6 /PC-A9 ) - ( 7 /REF9 ) - ( 8 /PC-A11 ) - ( 9 /REF11 ) - ( 10 GND ) - ( 11 /PC-A10 ) - ( 12 /REF10 ) - ( 13 /PC-A7 ) - ( 14 /REF7 ) - ( 15 /PC-A6 ) - ( 16 /REF6 ) - ( 17 /PC-A4 ) - ( 18 /REF4 ) - ( 19 /MATCHL ) - ( 20 VCC ) + ( /322D3295 R3 R4 330 + ( 1 N-000006 ) + ( 2 /LED1 ) ) - ( /322D32FA $noname U9 4003APG120 {Lib=4003APG120} - ( D11 VCC ) - ( C3 VCC ) - ( G12 VCC ) - ( L10 VCC ) - ( M7 VCC ) - ( L3 VCC ) - ( E11 ? ) - ( D12 /BIT0 ) - ( E12 /INIT- ) - ( D13 /ERROR- ) - ( F11 /SLCTIN- ) - ( E13 /BIT1 ) - ( F12 /BIT2 ) - ( G13 /BIT3 ) - ( H13 /BIT4 ) - ( J13 /BIT6 ) - ( H12 /BIT5 ) - ( H11 /BIT7 ) - ( K13 /ACK ) - ( J12 /BUST+ ) - ( L13 /PE+ ) - ( K12 ? ) - ( J11 ? ) - ( L12 /D7 ) - ( M11 /D6 ) - ( N13 /SLCT+ ) - ( N12 ? ) - ( L9 ? ) - ( M10 /D4 ) - ( N11 /D5 ) - ( M9 /D3 ) - ( N10 /PC-AEN ) - ( L8 /PC-A10 ) - ( N9 /D2 ) - ( M8 /PC-RD ) - ( N8 /D1 ) - ( N7 /PC-A9 ) - ( N6 /PC-WR ) - ( N5 ? ) - ( M6 /PC-A0 ) - ( L6 ? ) - ( N4 /PC-A1 ) - ( M5 /PC-A2 ) - ( N3 ? ) - ( M4 /CLKLCA ) - ( L5 ? ) - ( M2 ? ) - ( L2 /SEL_LPT ) - ( N1 ? ) - ( M1 ? ) - ( J3 ? ) - ( K2 /PC-A3 ) - ( L1 N-000005 ) - ( J2 /PC-A5 ) - ( K1 /8MH-OUT ) - ( H3 /PC-A4 ) - ( J1 /PC-A6 ) - ( H2 /PC-A7 ) - ( H1 /PC-A8 ) - ( B13 ? ) - ( C12 /AUTOFD- ) - ( A12 /STROBE ) - ( C9 /MA10 ) - ( B10 ? ) - ( A11 /MA0 ) - ( B9 /OE- ) - ( A10 /CS1- ) - ( C8 /MA16 ) - ( B8 /MD7 ) - ( A9 /MD6 ) - ( A8 /MD5 ) - ( A7 /MD4 ) - ( A6 /MD3 ) - ( B6 /MD2 ) - ( A5 /MD1 ) - ( C6 /MD0 ) - ( A4 /MA9 ) - ( B5 ? ) - ( A3 ? ) - ( B4 ? ) - ( C5 ? ) - ( A2 ? ) - ( A1 ? ) - ( B3 /MA7 ) - ( B2 /MA1 ) - ( D3 /MA2 ) - ( C2 /MA3 ) - ( B1 ? ) - ( E3 ? ) - ( D2 /MA11 ) - ( C1 /MA13 ) - ( E2 ? ) - ( D1 /MA14 ) - ( F3 /MA12 ) - ( F2 /MA6 ) - ( E1 /MA4 ) - ( F1 /MA15 ) - ( G1 /MA8 ) - ( C13 /MA5 ) - ( A13 /WR- ) - ( F13 /LED2 ) - ( L4 /CLKLCA ) - ( M3 /LED1 ) - ( N2 /D0 ) - ( L11 /DONE ) - ( M12 /PROG- ) - ( B12 VCC ) - ( B11 VCC ) - ( C11 VCC ) - ( C4 GND ) - ( B7 GND ) - ( C10 GND ) - ( G11 GND ) - ( K11 GND ) - ( L7 GND ) - ( K3 GND ) - ( G2 GND ) + ( /322D32A0 R3 R5 330 + ( 1 N-000007 ) + ( 2 /LED2 ) ) - ( /322D32BE $noname D2 LED {Lib=LED} - ( 1 N-000007 ) - ( 2 GND ) + ( /325679C1 r_pack9 RR1 9x1K + ( 1 VCC ) + ( 2 /REF5 ) + ( 3 /REF4 ) + ( 4 /REF8 ) + ( 5 /REF6 ) + ( 6 /REF9 ) + ( 7 /REF7 ) + ( 8 /REF11 ) + ( 9 /REF10 ) + ( 10 ? ) ) - ( /322D32AC $noname D1 LED {Lib=LED} - ( 1 N-000006 ) - ( 2 GND ) + ( /322D31F4 20dip300 U1 74LS245 + ( 1 /DIR ) + ( 2 /PC-DB0 ) + ( 3 /PC-DB1 ) + ( 4 /PC-DB2 ) + ( 5 /PC-DB3 ) + ( 6 /PC-DB4 ) + ( 7 /PC-DB5 ) + ( 8 /PC-DB6 ) + ( 9 /PC-DB7 ) + ( 10 GND ) + ( 11 /D7 ) + ( 12 /D6 ) + ( 13 /D5 ) + ( 14 /D4 ) + ( 15 /D3 ) + ( 16 /D2 ) + ( 17 /D1 ) + ( 18 /D0 ) + ( 19 /ENBBUF ) + ( 20 VCC ) ) - ( /322D32A0 $noname R5 330 {Lib=R} - ( 1 N-000007 ) - ( 2 /LED2 ) + ( /322D35B4 20dip300 U2 74LS688 + ( 1 /PC-AEN ) + ( 2 /PC-A5 ) + ( 3 /REF5 ) + ( 4 /PC-A8 ) + ( 5 /REF8 ) + ( 6 /PC-A9 ) + ( 7 /REF9 ) + ( 8 /PC-A11 ) + ( 9 /REF11 ) + ( 10 GND ) + ( 11 /PC-A10 ) + ( 12 /REF10 ) + ( 13 /PC-A7 ) + ( 14 /REF7 ) + ( 15 /PC-A6 ) + ( 16 /REF6 ) + ( 17 /PC-A4 ) + ( 18 /REF4 ) + ( 19 /MATCHL ) + ( 20 VCC ) ) - ( /322D3295 $noname R4 330 {Lib=R} - ( 1 N-000006 ) - ( 2 /LED1 ) + ( /322D31CA 20dip300 U3 74LS541 + ( 1 GND ) + ( 2 /PC-A1 ) + ( 3 /PC-A0 ) + ( 4 /PC-A2 ) + ( 5 /PC-A3 ) + ( 6 /PC-IOW ) + ( 7 /PC-IOR ) + ( 8 /PC-RST ) + ( 9 /PC-RST ) + ( 10 GND ) + ( 11 ? ) + ( 12 /RSTL ) + ( 13 /PC-RD ) + ( 14 /PC-WR ) + ( 15 N-000124 ) + ( 16 N-000125 ) + ( 17 N-000126 ) + ( 18 N-000127 ) + ( 19 GND ) + ( 20 VCC ) ) - ( /322D321C $noname U8 EP600 {Lib=EP600} - ( 1 GND ) - ( 2 /MATCHL ) - ( 3 N-000127 ) - ( 4 N-000126 ) - ( 5 N-000125 ) - ( 6 N-000124 ) - ( 7 /PC-WR ) - ( 8 ? ) - ( 9 ? ) - ( 10 ? ) - ( 11 /RSTL ) - ( 12 GND ) - ( 13 /WR_REG ) - ( 14 /PC-RD ) - ( 15 /WR_REG ) - ( 16 /CLKLCA ) - ( 17 /DIR ) - ( 18 /SEL_LPT ) - ( 19 /PROG- ) - ( 20 /DONE ) - ( 21 /D0 ) - ( 22 /ENBBUF ) - ( 23 VCC ) - ( 24 VCC ) + ( /3240023F 32dip600 U5 628128 + ( 2 /MA16 ) + ( 3 /MA14 ) + ( 4 /MA12 ) + ( 5 /MA7 ) + ( 6 /MA6 ) + ( 7 /MA5 ) + ( 8 /MA4 ) + ( 9 /MA3 ) + ( 10 /MA2 ) + ( 11 /MA1 ) + ( 12 /MA0 ) + ( 13 /MD0 ) + ( 14 /MD1 ) + ( 15 /MD2 ) + ( 16 GND ) + ( 17 /MD3 ) + ( 18 /MD4 ) + ( 19 /MD5 ) + ( 20 /MD6 ) + ( 21 /MD7 ) + ( 22 /CS1- ) + ( 23 /MA10 ) + ( 24 /OE- ) + ( 25 /MA11 ) + ( 26 /MA9 ) + ( 27 /MA8 ) + ( 28 /MA13 ) + ( 29 /WR- ) + ( 30 N-000114 ) + ( 31 /MA15 ) + ( 32 VCC ) ) - ( /322D31F4 $noname U1 74LS245 {Lib=74LS245} - ( 1 /DIR ) - ( 2 /PC-DB0 ) - ( 3 /PC-DB1 ) - ( 4 /PC-DB2 ) - ( 5 /PC-DB3 ) - ( 6 /PC-DB4 ) - ( 7 /PC-DB5 ) - ( 8 /PC-DB6 ) - ( 9 /PC-DB7 ) - ( 10 GND ) - ( 11 /D7 ) - ( 12 /D6 ) - ( 13 /D5 ) - ( 14 /D4 ) - ( 15 /D3 ) - ( 16 /D2 ) - ( 17 /D1 ) - ( 18 /D0 ) - ( 19 /ENBBUF ) - ( 20 VCC ) + ( /322D321C 24dip300 U8 EP600 + ( 1 GND ) + ( 2 /MATCHL ) + ( 3 N-000127 ) + ( 4 N-000126 ) + ( 5 N-000125 ) + ( 6 N-000124 ) + ( 7 /PC-WR ) + ( 8 ? ) + ( 9 ? ) + ( 10 ? ) + ( 11 /RSTL ) + ( 12 GND ) + ( 13 /WR_REG ) + ( 14 /PC-RD ) + ( 15 /WR_REG ) + ( 16 /CLKLCA ) + ( 17 /DIR ) + ( 18 /SEL_LPT ) + ( 19 /PROG- ) + ( 20 /DONE ) + ( 21 /D0 ) + ( 22 /ENBBUF ) + ( 23 VCC ) + ( 24 VCC ) ) - ( /322D31CA $noname U3 74LS541 {Lib=74LS541} - ( 1 GND ) - ( 2 /PC-A1 ) - ( 3 /PC-A0 ) - ( 4 /PC-A2 ) - ( 5 /PC-A3 ) - ( 6 /PC-IOW ) - ( 7 /PC-IOR ) - ( 8 /PC-RST ) - ( 9 /PC-RST ) - ( 10 GND ) - ( 11 ? ) - ( 12 /RSTL ) - ( 13 /PC-RD ) - ( 14 /PC-WR ) - ( 15 N-000124 ) - ( 16 N-000125 ) - ( 17 N-000126 ) - ( 18 N-000127 ) - ( 19 GND ) - ( 20 VCC ) + ( /322D32FA PGA120 U9 4003APG120 + ( A1 ? ) + ( A2 ? ) + ( A3 ? ) + ( A4 /MA9 ) + ( A5 /MD1 ) + ( A6 /MD3 ) + ( A7 /MD4 ) + ( A8 /MD5 ) + ( A9 /MD6 ) + ( A10 /CS1- ) + ( A11 /MA0 ) + ( A12 /STROBE ) + ( A13 /WR- ) + ( B1 ? ) + ( B2 /MA1 ) + ( B3 /MA7 ) + ( B4 ? ) + ( B5 ? ) + ( B6 /MD2 ) + ( B7 GND ) + ( B8 /MD7 ) + ( B9 /OE- ) + ( B10 ? ) + ( B11 VCC ) + ( B12 VCC ) + ( B13 ? ) + ( C1 /MA13 ) + ( C2 /MA3 ) + ( C3 VCC ) + ( C4 GND ) + ( C5 ? ) + ( C6 /MD0 ) + ( C8 /MA16 ) + ( C9 /MA10 ) + ( C10 GND ) + ( C11 VCC ) + ( C12 /AUTOFD- ) + ( C13 /MA5 ) + ( D1 /MA14 ) + ( D2 /MA11 ) + ( D3 /MA2 ) + ( D11 VCC ) + ( D12 /BIT0 ) + ( D13 /ERROR- ) + ( E1 /MA4 ) + ( E2 ? ) + ( E3 ? ) + ( E11 ? ) + ( E12 /INIT- ) + ( E13 /BIT1 ) + ( F1 /MA15 ) + ( F2 /MA6 ) + ( F3 /MA12 ) + ( F11 /SLCTIN- ) + ( F12 /BIT2 ) + ( F13 /LED2 ) + ( G1 /MA8 ) + ( G2 GND ) + ( G11 GND ) + ( G12 VCC ) + ( G13 /BIT3 ) + ( H1 /PC-A8 ) + ( H2 /PC-A7 ) + ( H3 /PC-A4 ) + ( H11 /BIT7 ) + ( H12 /BIT5 ) + ( H13 /BIT4 ) + ( J1 /PC-A6 ) + ( J2 /PC-A5 ) + ( J3 ? ) + ( J11 ? ) + ( J12 /BUST+ ) + ( J13 /BIT6 ) + ( K1 /8MH-OUT ) + ( K2 /PC-A3 ) + ( K3 GND ) + ( K11 GND ) + ( K12 ? ) + ( K13 /ACK ) + ( L1 N-000005 ) + ( L2 /SEL_LPT ) + ( L3 VCC ) + ( L4 /CLKLCA ) + ( L5 ? ) + ( L6 ? ) + ( L7 GND ) + ( L8 /PC-A10 ) + ( L9 ? ) + ( L10 VCC ) + ( L11 /DONE ) + ( L12 /D7 ) + ( L13 /PE+ ) + ( M1 ? ) + ( M2 ? ) + ( M3 /LED1 ) + ( M4 /CLKLCA ) + ( M5 /PC-A2 ) + ( M6 /PC-A0 ) + ( M7 VCC ) + ( M8 /PC-RD ) + ( M9 /D3 ) + ( M10 /D4 ) + ( M11 /D6 ) + ( M12 /PROG- ) + ( N1 ? ) + ( N2 /D0 ) + ( N3 ? ) + ( N4 /PC-A1 ) + ( N5 ? ) + ( N6 /PC-WR ) + ( N7 /PC-A9 ) + ( N8 /D1 ) + ( N9 /D2 ) + ( N10 /PC-AEN ) + ( N11 /D5 ) + ( N12 ? ) + ( N13 /SLCT+ ) ) - ( /322D3011 $noname BUS1 BUSPC {Lib=BUSPC} - ( 1 GND ) - ( 2 /PC-RST ) - ( 3 VCC ) - ( 4 ? ) - ( 5 ? ) - ( 6 ? ) - ( 7 ? ) - ( 8 ? ) - ( 9 ? ) - ( 10 ? ) - ( 11 ? ) - ( 12 ? ) - ( 13 /PC-IOW ) - ( 14 /PC-IOR ) - ( 15 ? ) - ( 16 ? ) - ( 17 ? ) - ( 18 ? ) - ( 19 ? ) - ( 20 ? ) - ( 21 ? ) - ( 22 ? ) - ( 23 ? ) - ( 24 ? ) - ( 25 ? ) - ( 26 ? ) - ( 27 ? ) - ( 28 ? ) - ( 29 VCC ) - ( 30 ? ) - ( 31 GND ) - ( 32 ? ) - ( 33 /PC-DB7 ) - ( 34 /PC-DB6 ) - ( 35 /PC-DB5 ) - ( 36 /PC-DB4 ) - ( 37 /PC-DB3 ) - ( 38 /PC-DB2 ) - ( 39 /PC-DB1 ) - ( 40 /PC-DB0 ) - ( 41 ? ) - ( 42 /PC-AEN ) - ( 43 ? ) - ( 44 ? ) - ( 45 ? ) - ( 46 ? ) - ( 47 ? ) - ( 48 ? ) - ( 49 ? ) - ( 50 ? ) - ( 51 /PC-A11 ) - ( 52 /PC-A10 ) - ( 53 /PC-A9 ) - ( 54 /PC-A8 ) - ( 55 /PC-A7 ) - ( 56 /PC-A6 ) - ( 57 /PC-A5 ) - ( 58 /PC-A4 ) - ( 59 /PC-A3 ) - ( 60 /PC-A2 ) - ( 61 /PC-A1 ) - ( 62 /PC-A0 ) + ( /32307EC0 HC-18UH X1 8MHz + ( 1 N-000005 ) + ( 2 N-000004 ) ) ) * { Allowed footprints by component: -$component P1 - DB25* -$endlist -$component R3 - R? - SM0603 - SM0805 -$endlist -$component C3 +$component C1 + CP* SM* - C? - C1-1 $endlist $component C2 SM* C? C1-1 $endlist -$component R2 - R? - SM0603 - SM0805 -$endlist -$component R1 - R? - SM0603 - SM0805 -$endlist -$component C1 - CP* +$component C3 SM* + C? + C1-1 $endlist $component C4 CP* @@ -468,7 +450,20 @@ $component C6 CP* SM* $endlist -$component R5 +$component P1 + DB25* +$endlist +$component R1 + R? + SM0603 + SM0805 +$endlist +$component R2 + R? + SM0603 + SM0805 +$endlist +$component R3 R? SM0603 SM0805 @@ -478,428 +473,10 @@ $component R4 SM0603 SM0805 $endlist +$component R5 + R? + SM0603 + SM0805 +$endlist $endfootprintlist } -{ Pin List by Nets -Net 1 "GND" - BUS1 31 - U3 10 - U3 1 - U3 19 - U1 10 - U8 1 - U8 12 - D1 2 - D2 2 - U9 G2 - U9 K3 - U9 L7 - U9 K11 - U9 G11 - U9 C10 - U9 B7 - U9 C4 - U2 10 - C6 2 - C5 2 - C4 2 - C1 2 - C2 2 - C3 2 - BUS1 1 - U5 16 - P1 25 - P1 24 - P1 23 - P1 22 - P1 21 - P1 20 - P1 19 - P1 18 - JP1 15 - JP1 13 - JP1 11 - JP1 9 - JP1 7 - JP1 5 - JP1 3 - JP1 1 -Net 2 "VCC" - U9 L3 - U9 M7 - U9 L10 - U9 G12 - U9 C3 - RR1 1 - U9 D11 - U2 20 - C6 1 - C5 1 - C4 1 - C1 1 - BUS1 29 - U9 B12 - U9 B11 - U9 C11 - BUS1 3 - U8 24 - U8 23 - U1 20 - U3 20 - R3 2 - U5 32 -/Net 3 "8MH-OUT" - R2 1 - U9 K1 -Net 4 "" - C3 1 - X1 2 - R2 2 - R1 1 -Net 5 "" - X1 1 - C2 1 - U9 L1 - R1 2 -Net 6 "" - R4 1 - D1 1 -Net 7 "" - R5 1 - D2 1 -/Net 8 "REF8" - U2 5 - JP1 12 - RR1 4 -/Net 9 "REF5" - JP1 16 - RR1 2 - U2 3 -/Net 10 "REF6" - RR1 5 - JP1 10 - U2 16 -/Net 11 "REF7" - U2 14 - JP1 6 - RR1 7 -/Net 12 "REF11" - RR1 8 - U2 9 - JP1 4 -/Net 13 "REF4" - JP1 14 - RR1 3 - U2 18 -/Net 14 "REF10" - JP1 2 - RR1 9 - U2 12 -/Net 15 "REF9" - U2 7 - JP1 8 - RR1 6 -/Net 17 "STROBE" - P1 1 - U9 A12 -/Net 18 "AUTOFD-" - P1 14 - U9 C12 -/Net 19 "ERROR-" - U9 D13 - P1 15 -/Net 20 "BIT2" - U9 F12 - P1 4 -/Net 21 "INIT-" - P1 16 - U9 E12 -/Net 22 "SLCTIN-" - P1 17 - U9 F11 -/Net 23 "BIT0" - P1 2 - U9 D12 -/Net 24 "BIT1" - P1 3 - U9 E13 -/Net 25 "BIT3" - P1 5 - U9 G13 -/Net 26 "BIT4" - U9 H13 - P1 6 -/Net 27 "BIT5" - P1 7 - U9 H12 -/Net 28 "BIT6" - U9 J13 - P1 8 -/Net 29 "BIT7" - U9 H11 - P1 9 -/Net 30 "ACK" - P1 10 - U9 K13 -/Net 31 "BUST+" - U9 J12 - P1 11 -/Net 32 "PE+" - U9 L13 - P1 12 -/Net 33 "SLCT+" - U9 N13 - P1 13 -/Net 34 "D7" - U1 11 - U9 L12 -/Net 35 "D6" - U9 M11 - U1 12 -/Net 41 "D4" - U9 M10 - U1 14 -/Net 42 "D5" - U9 N11 - U1 13 -/Net 43 "D3" - U9 M9 - U1 15 -/Net 44 "PC-AEN" - U2 1 - BUS1 42 - U9 N10 -/Net 45 "PC-A10" - U9 L8 - U2 11 - BUS1 52 -/Net 46 "D2" - U1 16 - U9 N9 -/Net 47 "PC-RD" - U3 13 - U8 14 - U9 M8 -/Net 48 "D1" - U1 17 - U9 N8 -/Net 49 "PC-A9" - U2 6 - U9 N7 - BUS1 53 -/Net 50 "PC-WR" - U9 N6 - U8 7 - U3 14 -/Net 51 "PC-A0" - U9 M6 - U3 3 - BUS1 62 -/Net 54 "PC-A1" - U9 N4 - U3 2 - BUS1 61 -/Net 55 "PC-A2" - U3 4 - U9 M5 - BUS1 60 -/Net 57 "CLKLCA" - U9 M4 - U9 L4 - U8 16 -/Net 60 "SEL_LPT" - U8 18 - U9 L2 -/Net 63 "PC-A3" - BUS1 59 - U9 K2 - U3 5 -/Net 65 "PC-A5" - BUS1 57 - U2 2 - U9 J2 -/Net 66 "PC-A4" - BUS1 58 - U9 H3 - U2 17 -/Net 67 "PC-A6" - U2 15 - U9 J1 - BUS1 56 -/Net 68 "PC-A7" - U2 13 - BUS1 55 - U9 H2 -/Net 69 "PC-A8" - U9 H1 - U2 4 - BUS1 54 -/Net 72 "MA10" - U9 C9 - U5 23 -/Net 73 "MA0" - U9 A11 - U5 12 -/Net 74 "OE-" - U9 B9 - U5 24 -/Net 75 "CS1-" - U5 22 - U9 A10 -/Net 76 "MA16" - U9 C8 - U5 2 -/Net 77 "MD7" - U9 B8 - U5 21 -/Net 78 "MD6" - U5 20 - U9 A9 -/Net 79 "MD5" - U5 19 - U9 A8 -/Net 80 "MD4" - U9 A7 - U5 18 -/Net 81 "MD3" - U5 17 - U9 A6 -/Net 82 "MD2" - U5 15 - U9 B6 -/Net 83 "MD1" - U5 14 - U9 A5 -/Net 84 "MD0" - U5 13 - U9 C6 -/Net 85 "MA9" - U5 26 - U9 A4 -/Net 86 "MA8" - U9 G1 - U5 27 -/Net 93 "MA7" - U5 5 - U9 B3 -/Net 94 "MA1" - U9 B2 - U5 11 -/Net 95 "MA2" - U5 10 - U9 D3 -/Net 96 "MA3" - U9 C2 - U5 9 -/Net 100 "MA11" - U9 D2 - U5 25 -/Net 101 "MA13" - U9 C1 - U5 28 -/Net 102 "MA14" - U5 3 - U9 D1 -/Net 103 "MA12" - U9 F3 - U5 4 -/Net 104 "MA6" - U5 6 - U9 F2 -/Net 105 "MA4" - U5 8 - U9 E1 -/Net 106 "MA15" - U9 F1 - U5 31 -/Net 107 "LED1" - U9 M3 - R4 2 -/Net 108 "LED2" - U9 F13 - R5 2 -/Net 109 "MA5" - U5 7 - U9 C13 -/Net 110 "WR-" - U9 A13 - U5 29 -/Net 111 "D0" - U9 N2 - U1 18 - U8 21 -/Net 112 "DONE" - U8 20 - U9 L11 -/Net 113 "PROG-" - U9 M12 - U8 19 -Net 114 "" - R3 1 - U5 30 -/Net 115 "DIR" - U8 17 - U1 1 -/Net 116 "ENBBUF" - U8 22 - U1 19 -/Net 117 "WR_REG" - U8 15 - U8 13 -/Net 118 "MATCHL" - U8 2 - U2 19 -/Net 122 "RSTL" - U8 11 - U3 12 -Net 124 "" - U8 6 - U3 15 -Net 125 "" - U3 16 - U8 5 -Net 126 "" - U8 4 - U3 17 -Net 127 "" - U3 18 - U8 3 -/Net 128 "PC-RST" - U3 8 - BUS1 2 - U3 9 -/Net 129 "PC-IOR" - BUS1 14 - U3 7 -/Net 130 "PC-IOW" - BUS1 13 - U3 6 -/Net 131 "PC-A11" - BUS1 51 - U2 8 -/Net 132 "PC-DB7" - BUS1 33 - U1 9 -/Net 133 "PC-DB6" - BUS1 34 - U1 8 -/Net 134 "PC-DB5" - U1 7 - BUS1 35 -/Net 135 "PC-DB4" - BUS1 36 - U1 6 -/Net 136 "PC-DB3" - BUS1 37 - U1 5 -/Net 137 "PC-DB2" - U1 4 - BUS1 38 -/Net 138 "PC-DB1" - U1 3 - BUS1 39 -/Net 139 "PC-DB0" - BUS1 40 - U1 2 -} -#End diff --git a/demos/video/video.net b/demos/video/video.net index c385eaa14a..ecb1247400 100644 --- a/demos/video/video.net +++ b/demos/video/video.net @@ -1,4 +1,4 @@ -# EESchema Netlist Version 1.1 created 15/5/2008-12:10:50 +# EESchema Netlist Version 1.1 created 31/7/2008-16:28:18 ( ( /84DFBB8F $noname J4 DB9FEM {Lib=DB9} ( 1 /RED_OUT ) @@ -27,7 +27,7 @@ ( 1 /pal-ntsc.sch/RED_IN ) ( 2 GND ) ) - ( /482C2840/33A7E303 $noname U6 74LS245 {Lib=74LS245} + ( /4891E7CD/33A7E303 $noname U6 74LS245 {Lib=74LS245} ( 1 /graphic/WRITE_RAM ) ( 2 /buspci.sch/DQ24 ) ( 3 /buspci.sch/DQ25 ) @@ -49,7 +49,7 @@ ( 19 /muxdata/ACCES_RAM- ) ( 20 VCC ) ) - ( /482C2840/33A7E303 $noname U5 74LS245 {Lib=74LS245} + ( /4891E7CD/33A7E303 $noname U5 74LS245 {Lib=74LS245} ( 1 /graphic/WRITE_RAM ) ( 2 /muxdata/DPC16 ) ( 3 /muxdata/DPC17 ) @@ -71,7 +71,7 @@ ( 19 /muxdata/ACCES_RAM- ) ( 20 VCC ) ) - ( /482C2840/33A7E303 $noname U4 74LS245 {Lib=74LS245} + ( /4891E7CD/33A7E303 $noname U4 74LS245 {Lib=74LS245} ( 1 /graphic/WRITE_RAM ) ( 2 /graphic/DQ8 ) ( 3 /buspci.sch/DQ9 ) @@ -93,7 +93,7 @@ ( 19 /muxdata/ACCES_RAM- ) ( 20 VCC ) ) - ( /482C2840/33A7E303 $noname U3 74LS245 {Lib=74LS245} + ( /4891E7CD/33A7E303 $noname U3 74LS245 {Lib=74LS245} ( 1 /graphic/WRITE_RAM ) ( 2 /pal-ntsc.sch/PC_D0 ) ( 3 /graphic/DQ1 ) @@ -115,23 +115,23 @@ ( 19 /muxdata/ACCES_RAM- ) ( 20 VCC ) ) - ( /482C2840/33A567B8 $noname U22 XC4003-VQ100 {Lib=XC4003-VQ100} + ( /4891E7CD/33A567B8 $noname U22 XC4003-VQ100 {Lib=XC4003-VQ100} ( 1 GND ) ( 2 /ESVIDEO-RVB/CLKCAD ) - ( 3 ? ) - ( 4 ? ) - ( 5 ? ) - ( 6 ? ) + ( 3 ? ) + ( 4 ? ) + ( 5 ? ) + ( 6 ? ) ( 7 /CLAMP ) ( 8 /muxdata/BLANK- ) ( 9 /ESVIDEO-RVB/CSYNCOUT- ) - ( 10 ? ) + ( 10 ? ) ( 11 GND ) ( 12 VCC ) ( 13 /muxdata/ACQ_ON ) - ( 14 ? ) - ( 15 ? ) - ( 16 ? ) + ( 14 ? ) + ( 15 ? ) + ( 16 ? ) ( 17 /muxdata/VRAM0 ) ( 18 /RAMS/TVRAM3 ) ( 19 /RAMS/TVRAM1 ) @@ -142,10 +142,10 @@ ( 24 VCC ) ( 25 VCC ) ( 26 VCC ) - ( 27 ? ) + ( 27 ? ) ( 28 /RAMS/TVRAM4 ) ( 29 /RAMS/TVRAM5 ) - ( 30 ? ) + ( 30 ? ) ( 31 /RAMS/TVRAM6 ) ( 32 /RAMS/TVRAM7 ) ( 33 /muxdata/VRAM8 ) @@ -180,18 +180,18 @@ ( 62 /RAMS/TVRAM31 ) ( 63 VCC ) ( 64 GND ) - ( 65 ? ) - ( 66 ? ) + ( 65 ? ) + ( 66 ? ) ( 67 /pal-ntsc.sch/TVG0 ) ( 68 /ESVIDEO-RVB/TVG1 ) ( 69 /pal-ntsc.sch/TVG2 ) ( 70 /muxdata/TVG3 ) ( 71 /pal-ntsc.sch/TVG4 ) ( 72 /X_DATA ) - ( 73 ? ) + ( 73 ? ) ( 74 /muxdata/X_CLK ) ( 75 VCC ) - ( 76 ? ) + ( 76 ? ) ( 77 GND ) ( 78 /ESVIDEO-RVB/TVG5 ) ( 79 /CLKCDA ) @@ -217,137 +217,137 @@ ( 99 /ESVIDEO-RVB/TVB7 ) ( 100 VCC ) ) - ( /482C2842/349FB562 $noname L6 470nS {Lib=LIGNE_A_RETARD} + ( /4891E7CF/349FB562 $noname L6 470nS {Lib=LIGNE_A_RETARD} ( 1 N-000113 ) ( 2 N-000112 ) ( 3 GND ) ) - ( /482C2842/33A51A4E $noname R4 10K {Lib=R} + ( /4891E7CF/33A51A4E $noname R4 10K {Lib=R} ( 1 N-000111 ) ( 2 VCC ) ) - ( /482C2842/2276109D $noname POT1 100K {Lib=POT} + ( /4891E7CF/2276109D $noname POT1 100K {Lib=POT} ( 1 N-000101 ) ( 2 GND ) ( 3 GND ) ) - ( /482C2842/22761039 $noname Q1 BC848 {Lib=NPN} + ( /4891E7CF/22761039 $noname Q1 BC848 {Lib=NPN} ( 1 N-000092 ) ( 2 N-000089 ) ( 3 +5F ) ) - ( /482C2842/22761066 $noname Q2 BC848 {Lib=NPN} + ( /4891E7CF/22761066 $noname Q2 BC848 {Lib=NPN} ( 1 N-000097 ) ( 2 N-000096 ) ( 3 +5F ) ) - ( /482C2842/2276107F $noname Q3 BC848 {Lib=NPN} + ( /4891E7CF/2276107F $noname Q3 BC848 {Lib=NPN} ( 1 N-000099 ) ( 2 N-000098 ) ( 3 +5F ) ) - ( /482C2842/22760F76 $noname C54 4,7uF {Lib=CP} + ( /4891E7CF/22760F76 $noname C54 4,7uF {Lib=CP} ( 1 N-000087 ) ( 2 GND ) ) - ( /482C2842/22761048 $noname R39 68 {Lib=R} + ( /4891E7CF/22761048 $noname R39 68 {Lib=R} ( 1 /C_OUT ) ( 2 N-000092 ) ) - ( /482C2842/2276103E $noname R16 220 {Lib=R} + ( /4891E7CF/2276103E $noname R16 220 {Lib=R} ( 1 N-000089 ) ( 2 /modul/CHROM ) ) - ( /482C2842/2276107A $noname R17 220 {Lib=R} + ( /4891E7CF/2276107A $noname R17 220 {Lib=R} ( 1 N-000096 ) ( 2 /modul/LUM ) ) - ( /482C2842/22761075 $noname R40 68 {Lib=R} + ( /4891E7CF/22761075 $noname R40 68 {Lib=R} ( 1 N-000097 ) ( 2 /Y_OUT ) ) - ( /482C2842/22761093 $noname R18 220 {Lib=R} + ( /4891E7CF/22761093 $noname R18 220 {Lib=R} ( 1 N-000098 ) ( 2 /modul/CVBS ) ) - ( /482C2842/2276108E $noname R41 68 {Lib=R} + ( /4891E7CF/2276108E $noname R41 68 {Lib=R} ( 1 /modul/CVBSOUT ) ( 2 N-000099 ) ) - ( /482C2842/22760FE4 $noname R30 3,3K {Lib=R} + ( /4891E7CF/22760FE4 $noname R30 3,3K {Lib=R} ( 1 N-000085 ) ( 2 /ESVIDEO-RVB/CSYNCOUT- ) ) - ( /482C2842/22760FDF $noname R31 470 {Lib=R} + ( /4891E7CF/22760FDF $noname R31 470 {Lib=R} ( 1 GND ) ( 2 N-000085 ) ) - ( /482C2842/22760F80 $noname R10 1K {Lib=R} + ( /4891E7CF/22760F80 $noname R10 1K {Lib=R} ( 1 N-000113 ) ( 2 N-000088 ) ) - ( /482C2842/22760FBC $noname R11 1K {Lib=R} + ( /4891E7CF/22760FBC $noname R11 1K {Lib=R} ( 1 N-000112 ) ( 2 N-000086 ) ) - ( /482C2842/22761098 $noname R9 150K {Lib=R} + ( /4891E7CF/22761098 $noname R9 150K {Lib=R} ( 1 N-000101 ) ( 2 N-000091 ) ) - ( /482C2842/22760F8A $noname C61 47nF {Lib=C} + ( /4891E7CF/22760F8A $noname C61 47nF {Lib=C} ( 1 N-000085 ) ( 2 N-000102 ) ) - ( /482C2842/22760F67 $noname C60 47nF {Lib=C} + ( /4891E7CF/22760F67 $noname C60 47nF {Lib=C} ( 1 N-000103 ) ( 2 /BLUE_OUT ) ) - ( /482C2842/22760F8F $noname C43 220nF {Lib=C} + ( /4891E7CF/22760F8F $noname C43 220nF {Lib=C} ( 1 N-000080 ) ( 2 GND ) ) - ( /482C2842/22760FA8 $noname CV1 5/30pF {Lib=CTRIM} + ( /4891E7CF/22760FA8 $noname CV1 5/30pF {Lib=CTRIM} ( 1 N-000110 ) ( 2 GND ) ) - ( /482C2842/22760FD5 $noname C45 220nF {Lib=C} + ( /4891E7CF/22760FD5 $noname C45 220nF {Lib=C} ( 1 N-000094 ) ( 2 GND ) ) - ( /482C2842/22760FCB $noname C48 22nF {Lib=C} + ( /4891E7CF/22760FCB $noname C48 22nF {Lib=C} ( 1 GND ) ( 2 N-000086 ) ) - ( /482C2842/22760FC1 $noname C64 6,8uF {Lib=CP} + ( /4891E7CF/22760FC1 $noname C64 6,8uF {Lib=CP} ( 1 N-000086 ) ( 2 GND ) ) - ( /482C2842/22760F99 $noname C44 220nF {Lib=C} + ( /4891E7CF/22760F99 $noname C44 220nF {Lib=C} ( 1 N-000090 ) ( 2 GND ) ) - ( /482C2842/22760FF8 $noname C53 330pF {Lib=C} + ( /4891E7CF/22760FF8 $noname C53 330pF {Lib=C} ( 1 N-000100 ) ( 2 GND ) ) - ( /482C2842/22760FF3 $noname L1 2,2uH {Lib=INDUCTOR} + ( /4891E7CF/22760FF3 $noname L1 2,2uH {Lib=INDUCTOR} ( 1 N-000093 ) ( 2 N-000100 ) ) - ( /482C2842/22761052 $noname L3 22uH {Lib=INDUCTOR} + ( /4891E7CF/22761052 $noname L3 22uH {Lib=INDUCTOR} ( 1 VCC ) ( 2 +5F ) ) - ( /482C2842/22760F71 $noname L2 22uH {Lib=INDUCTOR} + ( /4891E7CF/22760F71 $noname L2 22uH {Lib=INDUCTOR} ( 1 VCC ) ( 2 N-000087 ) ) - ( /482C2842/22760F4E $noname U20 TDA8501 {Lib=TDA8501} - ( 1 ? ) + ( /4891E7CF/22760F4E $noname U20 TDA8501 {Lib=TDA8501} + ( 1 ? ) ( 2 N-000111 ) - ( 3 ? ) - ( 4 ? ) - ( 5 ? ) + ( 3 ? ) + ( 4 ? ) + ( 5 ? ) ( 6 N-000090 ) ( 7 N-000103 ) ( 8 N-000087 ) @@ -368,139 +368,139 @@ ( 23 N-000095 ) ( 24 N-000102 ) ) - ( /482C2842/22760FFD $noname C46 220pF {Lib=C} + ( /4891E7CF/22760FFD $noname C46 220pF {Lib=C} ( 1 N-000100 ) ( 2 GND ) ) - ( /482C2842/22761089 $noname R34 470 {Lib=R} + ( /4891E7CF/22761089 $noname R34 470 {Lib=R} ( 1 N-000099 ) ( 2 GND ) ) - ( /482C2842/22761070 $noname R33 470 {Lib=R} + ( /4891E7CF/22761070 $noname R33 470 {Lib=R} ( 1 N-000097 ) ( 2 GND ) ) - ( /482C2842/22761043 $noname R32 470 {Lib=R} + ( /4891E7CF/22761043 $noname R32 470 {Lib=R} ( 1 N-000092 ) ( 2 GND ) ) - ( /482C2842/22761057 $noname C55 4,7uF {Lib=CP} + ( /4891E7CF/22761057 $noname C55 4,7uF {Lib=CP} ( 1 +5F ) ( 2 GND ) ) - ( /482C2842/22760F62 $noname C59 47nF {Lib=C} + ( /4891E7CF/22760F62 $noname C59 47nF {Lib=C} ( 1 N-000108 ) ( 2 /ESVIDEO-RVB/GREEN ) ) - ( /482C2842/22760F53 $noname C58 47nF {Lib=C} + ( /4891E7CF/22760F53 $noname C58 47nF {Lib=C} ( 1 N-000109 ) ( 2 /RED_OUT ) ) - ( /482C2842/22760FA3 $noname X3 4,433618MH {Lib=CRYSTAL} + ( /4891E7CF/22760FA3 $noname X3 4,433618MH {Lib=CRYSTAL} ( 1 N-000110 ) ( 2 N-000095 ) ) - ( /482C2844/811D9080 $noname L4 22uF {Lib=INDUCTOR} + ( /4891E7D1/811D9080 $noname L4 22uF {Lib=INDUCTOR} ( 1 VCC ) ( 2 /pal-ntsc.sch/VAF ) ) - ( /482C2844/821CDAB8 $noname R35 470 {Lib=R} + ( /4891E7D1/821CDAB8 $noname R35 470 {Lib=R} ( 1 N-000151 ) ( 2 /pal-ntsc.sch/Y_SYNC ) ) - ( /482C2844/821CDAC2 $noname C1 100nF {Lib=C} + ( /4891E7D1/821CDAC2 $noname C1 100nF {Lib=C} ( 1 N-000151 ) ( 2 N-000152 ) ) - ( /482C2844/A9CA7F6B $noname C2 100nF {Lib=C} + ( /4891E7D1/A9CA7F6B $noname C2 100nF {Lib=C} ( 1 /pal-ntsc.sch/VAF ) ( 2 GND ) ) - ( /482C2844/A9CA7F75 $noname C3 100nF {Lib=C} + ( /4891E7D1/A9CA7F75 $noname C3 100nF {Lib=C} ( 1 N-000133 ) ( 2 /GREEN_IN ) ) - ( /482C2844/A9CA7F7A $noname C4 100nF {Lib=C} + ( /4891E7D1/A9CA7F7A $noname C4 100nF {Lib=C} ( 1 N-000134 ) ( 2 /pal-ntsc.sch/RED_IN ) ) - ( /482C2844/821CDA9A $noname R14 1M {Lib=R} + ( /4891E7D1/821CDA9A $noname R14 1M {Lib=R} ( 1 N-000152 ) ( 2 GND ) ) - ( /482C2844/8116F4AA $noname R3 100 {Lib=R} + ( /4891E7D1/8116F4AA $noname R3 100 {Lib=R} ( 1 /pal-ntsc.sch/Y-VIDEO ) ( 2 N-000133 ) ) - ( /482C2844/8116F4A5 $noname R2 100 {Lib=R} + ( /4891E7D1/8116F4A5 $noname R2 100 {Lib=R} ( 1 /pal-ntsc.sch/C-VIDEO ) ( 2 N-000134 ) ) - ( /482C2844/A9CA7F7F $noname D1 BAT46 {Lib=DIODESCH} + ( /4891E7D1/A9CA7F7F $noname D1 BAT46 {Lib=DIODESCH} ( 1 GND ) ( 2 /pal-ntsc.sch/Y-VIDEO ) ) - ( /482C2844/A9CA7F84 $noname D2 BAT46 {Lib=DIODESCH} + ( /4891E7D1/A9CA7F84 $noname D2 BAT46 {Lib=DIODESCH} ( 1 /pal-ntsc.sch/Y-VIDEO ) ( 2 VCC ) ) - ( /482C2844/A9CA7F8E $noname D3 BAT46 {Lib=DIODESCH} + ( /4891E7D1/A9CA7F8E $noname D3 BAT46 {Lib=DIODESCH} ( 1 GND ) ( 2 /pal-ntsc.sch/C-VIDEO ) ) - ( /482C2844/A9CA7F93 $noname D4 BAT46 {Lib=DIODESCH} + ( /4891E7D1/A9CA7F93 $noname D4 BAT46 {Lib=DIODESCH} ( 1 /pal-ntsc.sch/C-VIDEO ) ( 2 VCC ) ) - ( /482C2844/A9CA7FC5 $noname R27 27K {Lib=R} + ( /4891E7D1/A9CA7FC5 $noname R27 27K {Lib=R} ( 1 N-000144 ) ( 2 N-000150 ) ) - ( /482C2844/A9CA7FCA $noname R12 1K {Lib=R} + ( /4891E7D1/A9CA7FCA $noname R12 1K {Lib=R} ( 1 N-000136 ) ( 2 /pal-ntsc.sch/VAF ) ) - ( /482C2844/B15DA8C5 $noname C65 22pF {Lib=C} + ( /4891E7D1/B15DA8C5 $noname C65 22pF {Lib=C} ( 1 GND ) ( 2 N-000145 ) ) - ( /482C2844/B15DA8CA $noname C66 22pF {Lib=C} + ( /4891E7D1/B15DA8CA $noname C66 22pF {Lib=C} ( 1 GND ) ( 2 N-000146 ) ) - ( /482C2844/B15DA8C0 $noname X2 30MHz {Lib=CRYSTAL} + ( /4891E7D1/B15DA8C0 $noname X2 30MHz {Lib=CRYSTAL} ( 1 N-000145 ) ( 2 N-000146 ) ) - ( /482C2844/A9CA7FA7 $noname R19 220 {Lib=R} + ( /4891E7D1/A9CA7FA7 $noname R19 220 {Lib=R} ( 1 N-000137 ) ( 2 N-000143 ) ) - ( /482C2844/A9CA7FAC $noname C5 100nF {Lib=C} + ( /4891E7D1/A9CA7FAC $noname C5 100nF {Lib=C} ( 1 N-000141 ) ( 2 N-000137 ) ) - ( /482C2844/B176B9C3 $noname R20 220 {Lib=R} + ( /4891E7D1/B176B9C3 $noname R20 220 {Lib=R} ( 1 N-000138 ) ( 2 /pal-ntsc.sch/Y_SYNC ) ) - ( /482C2844/B176B9C8 $noname C8 100nF {Lib=C} + ( /4891E7D1/B176B9C8 $noname C8 100nF {Lib=C} ( 1 N-000142 ) ( 2 N-000138 ) ) - ( /482C2844/A9CA7FB1 $noname C6 100nF {Lib=C} + ( /4891E7D1/A9CA7FB1 $noname C6 100nF {Lib=C} ( 1 N-000136 ) ( 2 GND ) ) - ( /482C2844/A9CA7FB6 $noname C7 100nF {Lib=C} + ( /4891E7D1/A9CA7FB6 $noname C7 100nF {Lib=C} ( 1 N-000150 ) ( 2 GND ) ) - ( /482C2844/821CDABD $noname C47 220pF {Lib=C} + ( /4891E7D1/821CDABD $noname C47 220pF {Lib=C} ( 1 N-000151 ) ( 2 GND ) ) - ( /482C2844/BECCB834 $noname U10 BT812 {Lib=BT812} + ( /4891E7D1/BECCB834 $noname U10 BT812 {Lib=BT812} ( 1 /pal-ntsc.sch/VAF ) ( 2 /pal-ntsc.sch/VAF ) ( 3 GND ) @@ -509,20 +509,20 @@ ( 6 /pal-ntsc.sch/Y_SYNC ) ( 7 GND ) ( 16 GND ) - ( 25 ? ) - ( 26 ? ) - ( 27 ? ) - ( 28 ? ) - ( 29 ? ) + ( 25 ? ) + ( 26 ? ) + ( 27 ? ) + ( 28 ? ) + ( 29 ? ) ( 30 GND ) ( 31 VCC ) - ( 32 ? ) - ( 33 ? ) + ( 32 ? ) + ( 33 ? ) ( 34 /pal-ntsc.sch/VD_PAL- ) - ( 35 ? ) + ( 35 ? ) ( 36 /HD_PAL- ) - ( 37 ? ) - ( 38 ? ) + ( 37 ? ) + ( 38 ? ) ( 39 /pal-ntsc.sch/VAF ) ( 40 /pal-ntsc.sch/VAF ) ( 41 /pal-ntsc.sch/VAF ) @@ -584,13 +584,13 @@ ( 98 GND ) ( 99 /muxdata/DPC6 ) ( 100 /buspci.sch/DQ7 ) - ( 101 ? ) + ( 101 ? ) ( 102 VCC ) ( 103 GND ) ( 104 /pal-ntsc.sch/F_PALIN ) - ( 105 ? ) - ( 106 ? ) - ( 107 ? ) + ( 105 ? ) + ( 106 ? ) + ( 107 ? ) ( 108 N-000146 ) ( 109 N-000145 ) ( 110 N-000139 ) @@ -610,11 +610,11 @@ ( 124 GND ) ( 125 /pal-ntsc.sch/C-VIDEO ) ( 126 GND ) - ( 127 ? ) + ( 127 ? ) ( 128 GND ) - ( 129 ? ) + ( 129 ? ) ( 130 GND ) - ( 131 ? ) + ( 131 ? ) ( 132 /pal-ntsc.sch/VAF ) ( 134 GND ) ( 135 N-000144 ) @@ -630,11 +630,11 @@ ( 145 GND ) ( 147 GND ) ( 149 /pal-ntsc.sch/VAF ) - ( 150 ? ) + ( 150 ? ) ( 151 GND ) - ( 152 ? ) + ( 152 ? ) ( 153 GND ) - ( 154 ? ) + ( 154 ? ) ( 155 GND ) ( 156 /pal-ntsc.sch/Y-VIDEO ) ( 157 GND ) @@ -642,61 +642,61 @@ ( 159 /pal-ntsc.sch/VAF ) ( 160 /pal-ntsc.sch/VAF ) ) - ( /482C2844/811D9071 $noname C62 47uF {Lib=CP} + ( /4891E7D1/811D9071 $noname C62 47uF {Lib=CP} ( 1 /pal-ntsc.sch/VAF ) ( 2 GND ) ) - ( /482C2844/BF69A15D $noname C9 100nF {Lib=C} + ( /4891E7D1/BF69A15D $noname C9 100nF {Lib=C} ( 1 VCC ) ( 2 GND ) ) - ( /482C2844/BF69A162 $noname C10 100nF {Lib=C} + ( /4891E7D1/BF69A162 $noname C10 100nF {Lib=C} ( 1 VCC ) ( 2 GND ) ) - ( /482C2844/BF69A167 $noname C11 100nF {Lib=C} + ( /4891E7D1/BF69A167 $noname C11 100nF {Lib=C} ( 1 VCC ) ( 2 GND ) ) - ( /482C2844/BF69A17B $noname C14 100nF {Lib=C} + ( /4891E7D1/BF69A17B $noname C14 100nF {Lib=C} ( 1 /pal-ntsc.sch/VAF ) ( 2 GND ) ) - ( /482C2844/BF69A176 $noname C13 100nF {Lib=C} + ( /4891E7D1/BF69A176 $noname C13 100nF {Lib=C} ( 1 /pal-ntsc.sch/VAF ) ( 2 GND ) ) - ( /482C2844/BF69A171 $noname C12 100nF {Lib=C} + ( /4891E7D1/BF69A171 $noname C12 100nF {Lib=C} ( 1 /pal-ntsc.sch/VAF ) ( 2 GND ) ) - ( /482C2844/0F47DCB8 $noname C16 100nF {Lib=C} + ( /4891E7D1/0F47DCB8 $noname C16 100nF {Lib=C} ( 1 N-000139 ) ( 2 GND ) ) - ( /482C2844/B1754313 $noname R25 220K {Lib=R} + ( /4891E7D1/B1754313 $noname R25 220K {Lib=R} ( 1 N-000146 ) ( 2 N-000145 ) ) - ( /482C2844/0939A342 $noname C15 100nF {Lib=C} + ( /4891E7D1/0939A342 $noname C15 100nF {Lib=C} ( 1 VCC ) ( 2 GND ) ) - ( /482C2846/34E1751D $noname P12 CONN_1 {Lib=CONN_1} + ( /4891E7D3/34E1751D $noname P12 CONN_1 {Lib=CONN_1} ( 1 GND ) ) - ( /482C2846/34E1718B $noname P9 CONN_1 {Lib=CONN_1} + ( /4891E7D3/34E1718B $noname P9 CONN_1 {Lib=CONN_1} ( 1 N-000204 ) ) - ( /482C2846/34E1718B $noname P11 CONN_1 {Lib=CONN_1} + ( /4891E7D3/34E1718B $noname P11 CONN_1 {Lib=CONN_1} ( 1 N-000203 ) ) - ( /482C2846/34E1718B $noname P10 CONN_1 {Lib=CONN_1} + ( /4891E7D3/34E1718B $noname P10 CONN_1 {Lib=CONN_1} ( 1 N-000202 ) ) - ( /482C2846/33BA5628 $noname U23 XC4003/PQ100 {Lib=XC4005-PQ100} + ( /4891E7D3/33BA5628 $noname U23 XC4003/PQ100 {Lib=XC4005-PQ100} ( 1 /SYSRST- ) - ( 2 ? ) + ( 2 ? ) ( 3 VCC ) ( 4 GND ) ( 5 /buspci.sch/DQ7 ) @@ -724,9 +724,9 @@ ( 28 VCC ) ( 29 N-000187 ) ( 30 /BPCLK ) - ( 31 ? ) + ( 31 ? ) ( 32 /graphic/PTNUM1 ) - ( 33 ? ) + ( 33 ? ) ( 34 /buspci.sch/PTNUM0 ) ( 35 /graphic/BE-3 ) ( 36 /graphic/BE-2 ) @@ -742,8 +742,8 @@ ( 46 //PCRD ) ( 47 /buspci.sch/WR- ) ( 48 /buspci.sch/ADR2 ) - ( 49 ? ) - ( 50 ? ) + ( 49 ? ) + ( 50 ? ) ( 51 N-000204 ) ( 52 GND ) ( 53 /graphic/DONE ) @@ -751,17 +751,17 @@ ( 55 /graphic/PROG* ) ( 56 /graphic/XTAL_I ) ( 57 /graphic/CLK10MHz ) - ( 58 ? ) + ( 58 ? ) ( 59 /graphic/RESERV1 ) - ( 60 ? ) + ( 60 ? ) ( 61 /graphic/CSIO- ) - ( 62 ? ) + ( 62 ? ) ( 63 /ESVIDEO-RVB/PCA2 ) ( 64 /graphic/PCA1 ) ( 65 /pal-ntsc.sch/PC_A0 ) ( 66 VCC ) ( 67 GND ) - ( 68 ? ) + ( 68 ? ) ( 69 /ESVIDEO-RVB/WRCAD- ) ( 70 /pal-ntsc.sch/BT812_WR- ) ( 71 /graphic/BT812_RD- ) @@ -769,10 +769,10 @@ ( 73 /WRCDA- ) ( 74 /graphic/RDCAD- ) ( 75 /graphic/DIN ) - ( 76 ? ) + ( 76 ? ) ( 77 /graphic/CCLK ) ( 78 VCC ) - ( 79 ? ) + ( 79 ? ) ( 80 GND ) ( 81 /graphic/LED ) ( 82 N-000203 ) @@ -791,27 +791,27 @@ ( 95 /graphic/DQ10 ) ( 96 /buspci.sch/DQ9 ) ( 97 /graphic/DQ8 ) - ( 98 ? ) - ( 99 ? ) - ( 100 ? ) + ( 98 ? ) + ( 99 ? ) + ( 100 ? ) ) - ( /482C2846/33AFD8EF $noname C73 100nF {Lib=C} + ( /4891E7D3/33AFD8EF $noname C73 100nF {Lib=C} ( 1 VCC ) ( 2 GND ) ) - ( /482C2846/33AFD8ED $noname C72 100nF {Lib=C} + ( /4891E7D3/33AFD8ED $noname C72 100nF {Lib=C} ( 1 VCC ) ( 2 GND ) ) - ( /482C2846/33AFD8E9 $noname C71 100nF {Lib=C} + ( /4891E7D3/33AFD8E9 $noname C71 100nF {Lib=C} ( 1 VCC ) ( 2 GND ) ) - ( /482C2846/33AFD8AF $noname C70 100nF {Lib=C} + ( /4891E7D3/33AFD8AF $noname C70 100nF {Lib=C} ( 1 VCC ) ( 2 GND ) ) - ( /482C2846/33A805F8 $noname U2 4C4001 {Lib=4C4001} + ( /4891E7D3/33A805F8 $noname U2 4C4001 {Lib=4C4001} ( 1 /graphic/ID0 ) ( 2 /graphic/ID1 ) ( 3 /graphic/IWR- ) @@ -833,40 +833,40 @@ ( 19 /graphic/ID3 ) ( 20 GND ) ) - ( /482C2846/33A7E0C8 $noname P4 CONN_2 {Lib=CONN_2} + ( /4891E7D3/33A7E0C8 $noname P4 CONN_2 {Lib=CONN_2} ( 1 N-000187 ) ( 2 GND ) ) - ( /482C2846/33A7E0B2 $noname R48 10K {Lib=R} + ( /4891E7D3/33A7E0B2 $noname R48 10K {Lib=R} ( 1 VCC ) ( 2 N-000187 ) ) - ( /482C2846/33A7DFAB $noname P5 CONN_5 {Lib=CONN_5} + ( /4891E7D3/33A7DFAB $noname P5 CONN_5 {Lib=CONN_5} ( 1 GND ) ( 2 /graphic/CCLK ) ( 3 /graphic/DIN ) ( 4 /graphic/DONE ) ( 5 /graphic/PROG* ) ) - ( /482C2846/33A7DDDD $noname U21 XC1736APD8 {Lib=XC1736APD8} + ( /4891E7D3/33A7DDDD $noname U21 XC1736APD8 {Lib=XC1736APD8} ( 1 /graphic/DIN ) ( 2 /graphic/CCLK ) ( 3 /graphic/PROG* ) ( 4 /graphic/PROG* ) ( 5 GND ) - ( 6 ? ) + ( 6 ? ) ( 7 VCC ) ( 8 VCC ) ) - ( /482C2846/33A7DCE3 $noname R1 10 {Lib=R} + ( /4891E7D3/33A7DCE3 $noname R1 10 {Lib=R} ( 1 /graphic/VOSC ) ( 2 VCC ) ) - ( /482C2846/33A7DC91 $noname C23 100nF {Lib=C} + ( /4891E7D3/33A7DC91 $noname C23 100nF {Lib=C} ( 1 /graphic/VOSC ) ( 2 GND ) ) - ( /482C2846/3366016A $noname U24 XC4005-PQ160 {Lib=XC4005-PQ160} + ( /4891E7D3/3366016A $noname U24 XC4005-PQ160 {Lib=XC4005-PQ160} ( 1 GND ) ( 2 /graphic/CLK10MHz ) ( 3 /PTRDY- ) @@ -942,7 +942,7 @@ ( 81 VCC ) ( 82 /X_PROG- ) ( 83 /graphic/IA6 ) - ( 84 ? ) + ( 84 ? ) ( 85 /graphic/IA5 ) ( 86 /graphic/IA4 ) ( 87 /graphic/IA3 ) @@ -975,7 +975,7 @@ ( 118 /X_DATA ) ( 119 /muxdata/X_CLK ) ( 120 VCC ) - ( 121 ? ) + ( 121 ? ) ( 122 GND ) ( 123 /RAMS/MXA5 ) ( 124 /RAMS/MXA4 ) @@ -1011,59 +1011,59 @@ ( 159 /graphic/CSIO- ) ( 160 VCC ) ) - ( /482C2846/2D5AA03C $noname R13 1K {Lib=R} + ( /4891E7D3/2D5AA03C $noname R13 1K {Lib=R} ( 1 VCC ) ( 2 N-000194 ) ) - ( /482C2846/2D5AA041 $noname D6 LED {Lib=LED} + ( /4891E7D3/2D5AA041 $noname D6 LED {Lib=LED} ( 1 N-000194 ) ( 2 /graphic/LED ) ) - ( /482C2846/B3BF4EDE $noname C49 22pF {Lib=C} + ( /4891E7D3/B3BF4EDE $noname C49 22pF {Lib=C} ( 1 N-000196 ) ( 2 GND ) ) - ( /482C2846/B3BF4EE8 $noname C50 22pF {Lib=C} + ( /4891E7D3/B3BF4EE8 $noname C50 22pF {Lib=C} ( 1 /graphic/XTAL_I ) ( 2 GND ) ) - ( /482C2846/B3BF4ED4 $noname X1 10MHz {Lib=CRYSTAL} + ( /4891E7D3/B3BF4ED4 $noname X1 10MHz {Lib=CRYSTAL} ( 1 N-000196 ) ( 2 /graphic/XTAL_I ) ) - ( /482C2846/B3BF4ED9 $noname R26 220K {Lib=R} + ( /4891E7D3/B3BF4ED9 $noname R26 220K {Lib=R} ( 1 /graphic/XTAL_I ) ( 2 N-000196 ) ) - ( /482C2846/BF805547 $noname C17 100nF {Lib=C} + ( /4891E7D3/BF805547 $noname C17 100nF {Lib=C} ( 1 VCC ) ( 2 GND ) ) - ( /482C2846/BF80554C $noname C18 100nF {Lib=C} + ( /4891E7D3/BF80554C $noname C18 100nF {Lib=C} ( 1 VCC ) ( 2 GND ) ) - ( /482C2846/BF805551 $noname C19 100nF {Lib=C} + ( /4891E7D3/BF805551 $noname C19 100nF {Lib=C} ( 1 VCC ) ( 2 GND ) ) - ( /482C2846/BF805556 $noname C20 100nF {Lib=C} + ( /4891E7D3/BF805556 $noname C20 100nF {Lib=C} ( 1 VCC ) ( 2 GND ) ) - ( /482C2846/B9ED7AB0 $noname C56 4,7uF {Lib=CP} + ( /4891E7D3/B9ED7AB0 $noname C56 4,7uF {Lib=CP} ( 1 VCC ) ( 2 GND ) ) - ( /482C2846/B9ED7AB5 $noname C57 4,7uF {Lib=CP} + ( /4891E7D3/B9ED7AB5 $noname C57 4,7uF {Lib=CP} ( 1 VCC ) ( 2 GND ) ) - ( /482C2846/228C4700 $noname C63 47uF {Lib=CP} + ( /4891E7D3/228C4700 $noname C63 47uF {Lib=CP} ( 1 /graphic/VOSC ) ( 2 GND ) ) - ( /482C2846/2295D392 $noname U7 AV9173 {Lib=AV9173} + ( /4891E7D3/2295D392 $noname U7 AV9173 {Lib=AV9173} ( 1 /graphic/HDOUT ) ( 2 /graphic/HDREFOUT ) ( 3 GND ) @@ -1071,21 +1071,21 @@ ( 5 /graphic/VOSC ) ( 6 /graphic/14MHZOUT ) ( 7 /graphic/VOSC ) - ( 8 ? ) + ( 8 ? ) ) - ( /482C2846/268A4E88 $noname C22 100nF {Lib=C} + ( /4891E7D3/268A4E88 $noname C22 100nF {Lib=C} ( 1 VCC ) ( 2 GND ) ) - ( /482C2846/268A4E83 $noname C21 100nF {Lib=C} + ( /4891E7D3/268A4E83 $noname C21 100nF {Lib=C} ( 1 VCC ) ( 2 GND ) ) - ( /482C2846/525FE207 $noname R21 220 {Lib=R} + ( /4891E7D3/525FE207 $noname R21 220 {Lib=R} ( 1 N-000196 ) ( 2 /graphic/CLK10MHz ) ) - ( /482C2848/32FA1E5B $noname U13 SIM4X32 {Lib=SIM4X32} + ( /4891E7D5/32FA1E5B $noname U13 SIM4X32 {Lib=SIM4X32} ( 1 GND ) ( 2 /muxdata/VRAM0 ) ( 3 /RAMS/TVRAM16 ) @@ -1141,13 +1141,13 @@ ( 63 /RAMS/TVRAM14 ) ( 64 /RAMS/TVRAM31 ) ( 65 /RAMS/TVRAM15 ) - ( 67 ? ) - ( 68 ? ) - ( 69 ? ) - ( 70 ? ) + ( 67 ? ) + ( 68 ? ) + ( 69 ? ) + ( 70 ? ) ( 72 GND ) ) - ( /482C2848/32FA1E5B $noname U14 SIM4X32 {Lib=SIM4X32} + ( /4891E7D5/32FA1E5B $noname U14 SIM4X32 {Lib=SIM4X32} ( 1 GND ) ( 2 /muxdata/VRAM0 ) ( 3 /RAMS/TVRAM16 ) @@ -1203,13 +1203,13 @@ ( 63 /RAMS/TVRAM14 ) ( 64 /RAMS/TVRAM31 ) ( 65 /RAMS/TVRAM15 ) - ( 67 ? ) - ( 68 ? ) - ( 69 ? ) - ( 70 ? ) + ( 67 ? ) + ( 68 ? ) + ( 69 ? ) + ( 70 ? ) ( 72 GND ) ) - ( /482C2848/32FA1E5B $noname U12 SIM4X32 {Lib=SIM4X32} + ( /4891E7D5/32FA1E5B $noname U12 SIM4X32 {Lib=SIM4X32} ( 1 GND ) ( 2 /muxdata/VRAM0 ) ( 3 /RAMS/TVRAM16 ) @@ -1265,13 +1265,13 @@ ( 63 /RAMS/TVRAM14 ) ( 64 /RAMS/TVRAM31 ) ( 65 /RAMS/TVRAM15 ) - ( 67 ? ) - ( 68 ? ) - ( 69 ? ) - ( 70 ? ) + ( 67 ? ) + ( 68 ? ) + ( 69 ? ) + ( 70 ? ) ( 72 GND ) ) - ( /482C2848/32FA1E5B $noname U16 SIM4X32 {Lib=SIM4X32} + ( /4891E7D5/32FA1E5B $noname U16 SIM4X32 {Lib=SIM4X32} ( 1 GND ) ( 2 /muxdata/VRAM0 ) ( 3 /RAMS/TVRAM16 ) @@ -1327,13 +1327,13 @@ ( 63 /RAMS/TVRAM14 ) ( 64 /RAMS/TVRAM31 ) ( 65 /RAMS/TVRAM15 ) - ( 67 ? ) - ( 68 ? ) - ( 69 ? ) - ( 70 ? ) + ( 67 ? ) + ( 68 ? ) + ( 69 ? ) + ( 70 ? ) ( 72 GND ) ) - ( /482C2848/32FA1E5B $noname U15 SIM4X32 {Lib=SIM4X32} + ( /4891E7D5/32FA1E5B $noname U15 SIM4X32 {Lib=SIM4X32} ( 1 GND ) ( 2 /muxdata/VRAM0 ) ( 3 /RAMS/TVRAM16 ) @@ -1389,13 +1389,13 @@ ( 63 /RAMS/TVRAM14 ) ( 64 /RAMS/TVRAM31 ) ( 65 /RAMS/TVRAM15 ) - ( 67 ? ) - ( 68 ? ) - ( 69 ? ) - ( 70 ? ) + ( 67 ? ) + ( 68 ? ) + ( 69 ? ) + ( 70 ? ) ( 72 GND ) ) - ( /482C2848/32FA1E5B $noname U17 SIM4X32 {Lib=SIM4X32} + ( /4891E7D5/32FA1E5B $noname U17 SIM4X32 {Lib=SIM4X32} ( 1 GND ) ( 2 /muxdata/VRAM0 ) ( 3 /RAMS/TVRAM16 ) @@ -1451,13 +1451,13 @@ ( 63 /RAMS/TVRAM14 ) ( 64 /RAMS/TVRAM31 ) ( 65 /RAMS/TVRAM15 ) - ( 67 ? ) - ( 68 ? ) - ( 69 ? ) - ( 70 ? ) + ( 67 ? ) + ( 68 ? ) + ( 69 ? ) + ( 70 ? ) ( 72 GND ) ) - ( /482C2848/32FA1E5B $noname U18 SIM4X32 {Lib=SIM4X32} + ( /4891E7D5/32FA1E5B $noname U18 SIM4X32 {Lib=SIM4X32} ( 1 GND ) ( 2 /muxdata/VRAM0 ) ( 3 /RAMS/TVRAM16 ) @@ -1513,13 +1513,13 @@ ( 63 /RAMS/TVRAM14 ) ( 64 /RAMS/TVRAM31 ) ( 65 /RAMS/TVRAM15 ) - ( 67 ? ) - ( 68 ? ) - ( 69 ? ) - ( 70 ? ) + ( 67 ? ) + ( 68 ? ) + ( 69 ? ) + ( 70 ? ) ( 72 GND ) ) - ( /482C2848/32FA1E5B $noname U19 SIM4X32 {Lib=SIM4X32} + ( /4891E7D5/32FA1E5B $noname U19 SIM4X32 {Lib=SIM4X32} ( 1 GND ) ( 2 /muxdata/VRAM0 ) ( 3 /RAMS/TVRAM16 ) @@ -1575,25 +1575,25 @@ ( 63 /RAMS/TVRAM14 ) ( 64 /RAMS/TVRAM31 ) ( 65 /RAMS/TVRAM15 ) - ( 67 ? ) - ( 68 ? ) - ( 69 ? ) - ( 70 ? ) + ( 67 ? ) + ( 68 ? ) + ( 69 ? ) + ( 70 ? ) ( 72 GND ) ) - ( /482C284A/33AFD43A $noname C69 4,7uF {Lib=CP} + ( /4891E7D7/33AFD43A $noname C69 4,7uF {Lib=CP} ( 1 +3.3V ) ( 2 GND ) ) - ( /482C284A/33AFD420 $noname C68 4,7uF {Lib=CP} + ( /4891E7D7/33AFD420 $noname C68 4,7uF {Lib=CP} ( 1 +3.3V ) ( 2 GND ) ) - ( /482C284A/33AFD420 $noname C67 4,7uF {Lib=CP} + ( /4891E7D7/33AFD420 $noname C67 4,7uF {Lib=CP} ( 1 VCC ) ( 2 GND ) ) - ( /482C284A/21FA8347 $noname U11 S5933_PQ160 {Lib=S5933_PQ160} + ( /4891E7D7/21FA8347 $noname U11 S5933_PQ160 {Lib=S5933_PQ160} ( 1 /buspci.sch/EQ0 ) ( 2 /buspci.sch/P_AD23 ) ( 3 /buspci.sch/P_AD22 ) @@ -1753,74 +1753,74 @@ ( 159 /buspci.sch/P_C/BE3# ) ( 160 /buspci.sch/P_IDSEL ) ) - ( /482C284A/2691B632 $noname W4 TEST {Lib=TEST} + ( /4891E7D7/2691B632 $noname W4 TEST {Lib=TEST} ( 1 GND ) ( 2 N-000284 ) ) - ( /482C284A/2691B637 $noname W5 TEST {Lib=TEST} + ( /4891E7D7/2691B637 $noname W5 TEST {Lib=TEST} ( 1 GND ) ( 2 N-000286 ) ) - ( /482C284A/26A799E8 $noname R5 10K {Lib=R} + ( /4891E7D7/26A799E8 $noname R5 10K {Lib=R} ( 1 N-000269 ) ( 2 VCC ) ) - ( /482C284A/26A79A01 $noname R6 10K {Lib=R} + ( /4891E7D7/26A79A01 $noname R6 10K {Lib=R} ( 1 N-000338 ) ( 2 VCC ) ) - ( /482C284A/26A79A0B $noname R7 10K {Lib=R} + ( /4891E7D7/26A79A0B $noname R7 10K {Lib=R} ( 1 N-000339 ) ( 2 VCC ) ) - ( /482C284A/26B211C0 $noname R28 2,2K {Lib=R} + ( /4891E7D7/26B211C0 $noname R28 2,2K {Lib=R} ( 1 VCC ) ( 2 N-000340 ) ) - ( /482C284A/26B211CF $noname R29 2,2K {Lib=R} + ( /4891E7D7/26B211CF $noname R29 2,2K {Lib=R} ( 1 VCC ) ( 2 N-000341 ) ) - ( /482C284A/26B211D9 $noname C24 100nF {Lib=C} + ( /4891E7D7/26B211D9 $noname C24 100nF {Lib=C} ( 1 VCC ) ( 2 GND ) ) - ( /482C284A/26B211E3 $noname C25 100nF {Lib=C} + ( /4891E7D7/26B211E3 $noname C25 100nF {Lib=C} ( 1 VCC ) ( 2 GND ) ) - ( /482C284A/26B211ED $noname C26 100nF {Lib=C} + ( /4891E7D7/26B211ED $noname C26 100nF {Lib=C} ( 1 VCC ) ( 2 GND ) ) - ( /482C284A/26B211F7 $noname C27 100nF {Lib=C} + ( /4891E7D7/26B211F7 $noname C27 100nF {Lib=C} ( 1 VCC ) ( 2 GND ) ) - ( /482C284A/26B21201 $noname C28 100nF {Lib=C} + ( /4891E7D7/26B21201 $noname C28 100nF {Lib=C} ( 1 VCC ) ( 2 GND ) ) - ( /482C284A/26B2120B $noname C29 100nF {Lib=C} + ( /4891E7D7/26B2120B $noname C29 100nF {Lib=C} ( 1 VCC ) ( 2 GND ) ) - ( /482C284A/26B21215 $noname C30 100nF {Lib=C} + ( /4891E7D7/26B21215 $noname C30 100nF {Lib=C} ( 1 VCC ) ( 2 GND ) ) - ( /482C284A/26B2121F $noname C31 100nF {Lib=C} + ( /4891E7D7/26B2121F $noname C31 100nF {Lib=C} ( 1 VCC ) ( 2 GND ) ) - ( /482C284A/2820F08A $noname C38 4,7uF {Lib=CP} + ( /4891E7D7/2820F08A $noname C38 4,7uF {Lib=CP} ( 1 VCC ) ( 2 GND ) ) - ( /482C284A/269C6109 $noname BUS1 BUSPCI_5V {Lib=BUSPCI-5V} + ( /4891E7D7/269C6109 $noname BUS1 BUSPCI_5V {Lib=BUSPCI-5V} ( A62 VCC ) ( A61 VCC ) - ( A60 ? ) + ( A60 ? ) ( A59 VCC ) ( A58 /buspci.sch/P_AD0 ) ( A57 /buspci.sch/P_AD2 ) @@ -1837,8 +1837,8 @@ ( A44 /buspci.sch/P_AD15 ) ( A43 /buspci.sch/P_PAR ) ( A42 GND ) - ( A41 ? ) - ( A40 ? ) + ( A41 ? ) + ( A40 ? ) ( A39 +3.3V ) ( A38 /buspci.sch/P_STOP# ) ( A37 GND ) @@ -1859,26 +1859,26 @@ ( A22 /buspci.sch/P_AD28 ) ( A21 +3.3V ) ( A20 /buspci.sch/P_AD30 ) - ( A19 ? ) + ( A19 ? ) ( A18 GND ) ( A17 /buspci.sch/P_GNT# ) ( A16 VCC ) ( A15 /buspci.sch/P_RST# ) - ( A14 ? ) - ( A11 ? ) + ( A14 ? ) + ( A11 ? ) ( A10 VCC ) - ( A9 ? ) + ( A9 ? ) ( A8 VCC ) - ( A7 ? ) + ( A7 ? ) ( A6 /buspci.sch/P_INTA# ) ( A5 VCC ) ( A4 N-000279 ) - ( A3 ? ) + ( A3 ? ) ( A2 +12V ) - ( A1 ? ) + ( A1 ? ) ( B62 VCC ) ( B61 VCC ) - ( B60 ? ) + ( B60 ? ) ( B59 VCC ) ( B58 /buspci.sch/P_AD1 ) ( B57 GND ) @@ -1922,20 +1922,20 @@ ( B17 GND ) ( B16 /buspci.sch/P_CLK ) ( B15 GND ) - ( B14 ? ) + ( B14 ? ) ( B11 N-000284 ) - ( B10 ? ) + ( B10 ? ) ( B9 N-000286 ) - ( B8 ? ) - ( B7 ? ) + ( B8 ? ) + ( B7 ? ) ( B6 VCC ) ( B5 VCC ) ( B4 N-000279 ) ( B3 GND ) - ( B2 ? ) - ( B1 ? ) + ( B2 ? ) + ( B1 ? ) ) - ( /482C284A/2F5F7E5C $noname U1 24C16 {Lib=24C16} + ( /4891E7D7/2F5F7E5C $noname U1 24C16 {Lib=24C16} ( 1 GND ) ( 2 GND ) ( 3 GND ) @@ -1945,7 +1945,7 @@ ( 7 VCC ) ( 8 VCC ) ) - ( /482C284A/C8AF8090 $noname RR1 8x10K {Lib=RR8} + ( /4891E7D7/C8AF8090 $noname RR1 8x10K {Lib=RR8} ( 1 VCC ) ( 2 /buspci.sch/EQ0 ) ( 3 /buspci.sch/DQ31 ) @@ -1956,7 +1956,7 @@ ( 8 /buspci.sch/DQ29 ) ( 9 /buspci.sch/EQ4 ) ) - ( /482C284A/C8B01EF2 $noname RR2 8x10K {Lib=RR8} + ( /4891E7D7/C8B01EF2 $noname RR2 8x10K {Lib=RR8} ( 1 VCC ) ( 2 /buspci.sch/EQ6 ) ( 3 /buspci.sch/DQ28 ) @@ -1967,7 +1967,7 @@ ( 8 /buspci.sch/DQ26 ) ( 9 /buspci.sch/EQ7 ) ) - ( /482C284A/C8B23B9F $noname RR3 8x10K {Lib=RR8} + ( /4891E7D7/C8B23B9F $noname RR3 8x10K {Lib=RR8} ( 1 VCC ) ( 2 /buspci.sch/EA4 ) ( 3 /buspci.sch/DQ24 ) @@ -1978,7 +1978,7 @@ ( 8 /buspci.sch/EA2 ) ( 9 /buspci.sch/DQ25 ) ) - ( /482C284A/C8B2B4CE $noname RR4 8x10K {Lib=RR8} + ( /4891E7D7/C8B2B4CE $noname RR4 8x10K {Lib=RR8} ( 1 VCC ) ( 2 /buspci.sch/EA6 ) ( 3 /buspci.sch/DQ22 ) @@ -1989,7 +1989,7 @@ ( 8 /buspci.sch/EA14 ) ( 9 /muxdata/DPC17 ) ) - ( /482C284A/C8B2B4E3 $noname RR5 8x10K {Lib=RR8} + ( /4891E7D7/C8B2B4E3 $noname RR5 8x10K {Lib=RR8} ( 1 VCC ) ( 2 /PTATN- ) ( 3 /buspci.sch/EA9 ) @@ -2000,7 +2000,7 @@ ( 8 /WRFIFDO- ) ( 9 /buspci.sch/EA7 ) ) - ( /482C284A/C93123CE $noname RR6 8x10K {Lib=RR8} + ( /4891E7D7/C93123CE $noname RR6 8x10K {Lib=RR8} ( 1 VCC ) ( 2 /PTRDY- ) ( 3 /buspci.sch/DQ20 ) @@ -2011,7 +2011,7 @@ ( 8 /muxdata/DPC19 ) ( 9 /buspci.sch/EA10 ) ) - ( /482C284A/C931248E $noname RR7 8x10K {Lib=RR8} + ( /4891E7D7/C931248E $noname RR7 8x10K {Lib=RR8} ( 1 VCC ) ( 2 /pal-ntsc.sch/PC_D0 ) ( 3 /graphic/DQ1 ) @@ -2022,7 +2022,7 @@ ( 8 /muxdata/DPC6 ) ( 9 /buspci.sch/DQ7 ) ) - ( /482C284A/C9363A3F $noname RR8 8x10K {Lib=RR8} + ( /4891E7D7/C9363A3F $noname RR8 8x10K {Lib=RR8} ( 1 VCC ) ( 2 /graphic/DQ15 ) ( 3 /graphic/DQ14 ) @@ -2033,33 +2033,33 @@ ( 8 /buspci.sch/DQ9 ) ( 9 /graphic/DQ8 ) ) - ( /482C284A/26A799F7 $noname W2 FLOAT# {Lib=TEST} + ( /4891E7D7/26A799F7 $noname W2 FLOAT# {Lib=TEST} ( 1 GND ) ( 2 N-000338 ) ) - ( /482C284A/26A79A10 $noname W3 SERNV {Lib=TEST} + ( /4891E7D7/26A79A10 $noname W3 SERNV {Lib=TEST} ( 1 GND ) ( 2 N-000339 ) ) - ( /482C284A/26A799ED $noname W1 16/32 {Lib=TEST} + ( /4891E7D7/26A799ED $noname W1 16/32 {Lib=TEST} ( 1 GND ) ( 2 N-000269 ) ) - ( /482C284C/335F5DF2 $noname C32 100nF {Lib=C} + ( /4891E7D9/335F5DF2 $noname C32 100nF {Lib=C} ( 1 GND ) ( 2 N-000343 ) ) - ( /482C284C/A4586827 $noname R8 150 {Lib=R} + ( /4891E7D9/A4586827 $noname R8 150 {Lib=R} ( 1 N-000368 ) ( 2 GND ) ) - ( /482C284C/32F9E902 $noname U9 BT473 {Lib=BT473} + ( /4891E7D9/32F9E902 $noname U9 BT473 {Lib=BT473} ( 1 /ESVIDEO-RVB/VAA ) ( 2 /ESVIDEO-RVB/VAA ) ( 3 GND ) ( 4 GND ) - ( 5 ? ) - ( 6 ? ) + ( 5 ? ) + ( 6 ? ) ( 7 /muxdata/BLANK- ) ( 8 /ESVIDEO-RVB/CSYNCOUT- ) ( 9 /CLKCDA ) @@ -2080,10 +2080,10 @@ ( 24 /pal-ntsc.sch/PC_A0 ) ( 25 /graphic/PCA1 ) ( 26 /ESVIDEO-RVB/PCA2 ) - ( 27 ? ) + ( 27 ? ) ( 28 /OE_PAL- ) ( 29 /ESVIDEO-RVB/OE_RVB- ) - ( 30 ? ) + ( 30 ? ) ( 31 GND ) ( 32 GND ) ( 33 /ESVIDEO-RVB/VAA ) @@ -2123,12 +2123,12 @@ ( 67 /ESVIDEO-RVB/TVB6 ) ( 68 /ESVIDEO-RVB/TVB7 ) ) - ( /482C284C/32F9E7F1 $noname U8 BT253 {Lib=BT253} + ( /4891E7D9/32F9E7F1 $noname U8 BT253 {Lib=BT253} ( 1 /ESVIDEO-RVB/VAA ) ( 2 GND ) ( 3 GND ) - ( 4 ? ) - ( 5 ? ) + ( 4 ? ) + ( 5 ? ) ( 6 N-000351 ) ( 7 N-000349 ) ( 8 /graphic/CSYNCIN- ) @@ -2197,115 +2197,115 @@ ( 71 /ESVIDEO-RVB/REF+ ) ( 72 N-000354 ) ( 73 /ESVIDEO-RVB/REF+ ) - ( 74 ? ) + ( 74 ? ) ( 75 N-000361 ) ( 76 /ESVIDEO-RVB/REF+ ) - ( 77 ? ) + ( 77 ? ) ( 78 /ESVIDEO-RVB/REF+ ) ( 79 N-000362 ) ( 80 /ESVIDEO-RVB/REF+ ) - ( 81 ? ) + ( 81 ? ) ( 82 /ESVIDEO-RVB/REF+ ) ( 83 N-000363 ) ( 84 /ESVIDEO-RVB/VAA ) ) - ( /482C284C/84DFB9D2 $noname R42 75 {Lib=R} + ( /4891E7D9/84DFB9D2 $noname R42 75 {Lib=R} ( 1 GND ) ( 2 /RED_OUT ) ) - ( /482C284C/84DFB9D7 $noname R43 75 {Lib=R} + ( /4891E7D9/84DFB9D7 $noname R43 75 {Lib=R} ( 1 GND ) ( 2 /ESVIDEO-RVB/GREEN ) ) - ( /482C284C/84DFB9DC $noname R44 75 {Lib=R} + ( /4891E7D9/84DFB9DC $noname R44 75 {Lib=R} ( 1 GND ) ( 2 /BLUE_OUT ) ) - ( /482C284C/84DFBA31 $noname C33 100nF {Lib=C} + ( /4891E7D9/84DFBA31 $noname C33 100nF {Lib=C} ( 1 /ESVIDEO-RVB/VAA ) ( 2 GND ) ) - ( /482C284C/84DFBA36 $noname C34 100nF {Lib=C} + ( /4891E7D9/84DFBA36 $noname C34 100nF {Lib=C} ( 1 /ESVIDEO-RVB/VAA ) ( 2 N-000368 ) ) - ( /482C284C/84DFBAEF $noname C42 2,2uF {Lib=CP} + ( /4891E7D9/84DFBAEF $noname C42 2,2uF {Lib=CP} ( 1 /ESVIDEO-RVB/VAA ) ( 2 N-000368 ) ) - ( /482C284C/84DFBB21 $noname C35 100nF {Lib=C} + ( /4891E7D9/84DFBB21 $noname C35 100nF {Lib=C} ( 1 /ESVIDEO-RVB/VAA ) ( 2 N-000344 ) ) - ( /482C284C/A44C0348 $noname R47 75 {Lib=R} + ( /4891E7D9/A44C0348 $noname R47 75 {Lib=R} ( 1 /pal-ntsc.sch/RED_IN ) ( 2 GND ) ) - ( /482C284C/A44C032F $noname R45 75 {Lib=R} + ( /4891E7D9/A44C032F $noname R45 75 {Lib=R} ( 1 /GREEN_IN ) ( 2 GND ) ) - ( /482C284C/A44C0339 $noname R46 75 {Lib=R} + ( /4891E7D9/A44C0339 $noname R46 75 {Lib=R} ( 1 /BLUE_IN ) ( 2 GND ) ) - ( /482C284C/A44C03AC $noname R38 510 {Lib=R} + ( /4891E7D9/A44C03AC $noname R38 510 {Lib=R} ( 1 N-000350 ) ( 2 GND ) ) - ( /482C284C/A44D982A $noname R15 1M {Lib=R} + ( /4891E7D9/A44D982A $noname R15 1M {Lib=R} ( 1 GND ) ( 2 N-000349 ) ) - ( /482C284C/A44D9848 $noname C36 100nF {Lib=C} + ( /4891E7D9/A44D9848 $noname C36 100nF {Lib=C} ( 1 N-000349 ) ( 2 N-000364 ) ) - ( /482C284C/A44D9843 $noname R36 470 {Lib=R} + ( /4891E7D9/A44D9843 $noname R36 470 {Lib=R} ( 1 N-000364 ) ( 2 N-000351 ) ) - ( /482C284C/A44D984D $noname C37 100pF {Lib=C} + ( /4891E7D9/A44D984D $noname C37 100pF {Lib=C} ( 1 GND ) ( 2 N-000364 ) ) - ( /482C284C/A44C034D $noname R24 220 {Lib=R} + ( /4891E7D9/A44C034D $noname R24 220 {Lib=R} ( 1 /pal-ntsc.sch/RED_IN ) ( 2 N-000367 ) ) - ( /482C284C/A44C0343 $noname R23 220 {Lib=R} + ( /4891E7D9/A44C0343 $noname R23 220 {Lib=R} ( 1 /GREEN_IN ) ( 2 N-000366 ) ) - ( /482C284C/A44C0334 $noname R22 220 {Lib=R} + ( /4891E7D9/A44C0334 $noname R22 220 {Lib=R} ( 1 /BLUE_IN ) ( 2 N-000365 ) ) - ( /482C284C/A44C037F $noname C39 1uF {Lib=C} + ( /4891E7D9/A44C037F $noname C39 1uF {Lib=C} ( 1 N-000363 ) ( 2 N-000367 ) ) - ( /482C284C/A44C0384 $noname C40 1uF {Lib=C} + ( /4891E7D9/A44C0384 $noname C40 1uF {Lib=C} ( 1 N-000362 ) ( 2 N-000366 ) ) - ( /482C284C/A44C0389 $noname C41 1uF {Lib=C} + ( /4891E7D9/A44C0389 $noname C41 1uF {Lib=C} ( 1 N-000361 ) ( 2 N-000365 ) ) - ( /482C284C/84DFB9B9 $noname C52 22uF {Lib=CP} + ( /4891E7D9/84DFB9B9 $noname C52 22uF {Lib=CP} ( 1 /ESVIDEO-RVB/VAA ) ( 2 GND ) ) - ( /482C284C/28ED6A43 $noname C51 22uF {Lib=CP} + ( /4891E7D9/28ED6A43 $noname C51 22uF {Lib=CP} ( 1 /ESVIDEO-RVB/VAA ) ( 2 GND ) ) - ( /482C284C/84DFBB99 $noname L5 22uH {Lib=INDUCTOR} + ( /4891E7D9/84DFBB99 $noname L5 22uH {Lib=INDUCTOR} ( 1 VCC ) ( 2 /ESVIDEO-RVB/VAA ) ) - ( /482C284C/5D7688E4 $noname R37 510 {Lib=R} + ( /4891E7D9/5D7688E4 $noname R37 510 {Lib=R} ( 1 GND ) ( 2 /ESVIDEO-RVB/REF+ ) ) diff --git a/internat/fr/kicad.mo b/internat/fr/kicad.mo index 7034f00b7758bd80e201aa2bcf54fea6aca8c754..f0409ba1ae1b17b83224c001c2a9cc1200fd20ce 100644 GIT binary patch delta 51688 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\n" "Language-Team: kicad team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -36,11 +36,13 @@ msgstr "Net Code" #: pcbnew/affiche.cpp:53 #: pcbnew/class_board.cpp:551 +#: pcbnew/class_module.cpp:1092 msgid "Pads" msgstr "Pads" #: pcbnew/affiche.cpp:67 #: pcbnew/class_board.cpp:561 +#: pcbnew/plotps.cpp:363 msgid "Vias" msgstr "Vias" @@ -49,6 +51,7 @@ msgid "Net Length" msgstr "Long. Net:" #: pcbnew/automove.cpp:207 +#: pcbnew/xchgmod.cpp:612 msgid "No Modules!" msgstr "Pas de Modules" @@ -146,10 +149,60 @@ msgid "Include egde layer" msgstr "Inclure couche Edge" #: pcbnew/block.cpp:154 +#: pcbnew/cotation.cpp:109 +#: pcbnew/dialog_edit_module.cpp:122 +#: pcbnew/dialog_orient_footprints.cpp:177 +#: pcbnew/globaleditpad.cpp:108 +#: pcbnew/mirepcb.cpp:103 +#: pcbnew/modedit_onclick.cpp:192 +#: pcbnew/modedit_onclick.cpp:224 +#: pcbnew/muonde.cpp:352 +#: pcbnew/pcbtexte.cpp:119 +#: pcbnew/sel_layer.cpp:163 +#: pcbnew/sel_layer.cpp:322 +#: pcbnew/set_color.cpp:357 +#: pcbnew/onrightclick.cpp:122 +#: pcbnew/onrightclick.cpp:136 +#: pcbnew/dialog_gendrill.cpp:297 +#: eeschema/eelayer.cpp:255 +#: eeschema/libedit_onrightclick.cpp:42 +#: eeschema/libedit_onrightclick.cpp:57 +#: eeschema/onrightclick.cpp:98 +#: eeschema/onrightclick.cpp:110 +#: eeschema/sheetlab.cpp:98 +#: gerbview/onrightclick.cpp:39 +#: gerbview/onrightclick.cpp:58 +#: gerbview/options.cpp:169 +#: gerbview/options.cpp:293 +#: gerbview/reglage.cpp:112 +#: gerbview/set_color.cpp:329 +#: common/displlst.cpp:111 +#: common/get_component_dialog.cpp:121 +#: common/selcolor.cpp:171 +#: share/svg_print.cpp:239 msgid "Cancel" msgstr "Annuler" #: pcbnew/block.cpp:157 +#: pcbnew/cotation.cpp:105 +#: pcbnew/dialog_edit_module.cpp:118 +#: pcbnew/dialog_orient_footprints.cpp:174 +#: pcbnew/dialog_zones_by_polygon.cpp:204 +#: pcbnew/mirepcb.cpp:99 +#: pcbnew/muonde.cpp:348 +#: pcbnew/pcbtexte.cpp:114 +#: pcbnew/sel_layer.cpp:159 +#: pcbnew/sel_layer.cpp:318 +#: pcbnew/set_color.cpp:353 +#: pcbnew/dialog_gendrill.cpp:292 +#: eeschema/eelayer.cpp:251 +#: eeschema/sheetlab.cpp:94 +#: gerbview/options.cpp:165 +#: gerbview/options.cpp:289 +#: gerbview/reglage.cpp:108 +#: gerbview/set_color.cpp:325 +#: common/displlst.cpp:106 +#: common/get_component_dialog.cpp:112 msgid "OK" msgstr "OK" @@ -198,30 +251,47 @@ msgid "Connect" msgstr "Connect" #: pcbnew/class_board.cpp:576 +#: eeschema/eelayer.h:115 msgid "NoConn" msgstr "Non Conn" #: pcbnew/class_board_item.cpp:23 +#: pcbnew/dialog_display_options.cpp:221 +#: pcbnew/dialog_display_options.cpp:229 +#: pcbnew/dialog_display_options.cpp:266 +#: pcbnew/dialog_zones_by_polygon.cpp:170 +#: pcbnew/pcbplot.cpp:415 +#: gerbview/options.cpp:321 msgid "Line" msgstr "Ligne" #: pcbnew/class_board_item.cpp:24 +#: pcbnew/dialog_pad_edit.cpp:198 msgid "Rect" msgstr "Rect" #: pcbnew/class_board_item.cpp:25 +#: pcbnew/class_drawsegment.cpp:311 msgid "Arc" msgstr "Arc" #: pcbnew/class_board_item.cpp:26 +#: pcbnew/class_drawsegment.cpp:307 +#: pcbnew/class_track.cpp:879 +#: pcbnew/dialog_pad_edit.cpp:176 +#: pcbnew/dialog_pad_edit.cpp:196 msgid "Circle" msgstr "Cercle" #: pcbnew/class_board_item.cpp:57 +#: pcbnew/class_pad.cpp:909 msgid "Net" msgstr "Net" #: pcbnew/class_board_item.cpp:62 +#: eeschema/component_class.cpp:74 +#: eeschema/dialog_build_BOM.cpp:298 +#: eeschema/edit_component_in_schematic.cpp:835 msgid "Footprint" msgstr "Module" @@ -265,10 +335,20 @@ msgid "Pcb Text" msgstr "Texte Pcb" #: pcbnew/class_board_item.cpp:100 +#: pcbnew/dialog_netlist.cpp:162 +#: eeschema/dialog_create_component.cpp:167 +#: eeschema/edit_component_in_schematic.cpp:758 +#: eeschema/onrightclick.cpp:307 +#: eeschema/eelayer.h:152 msgid "Reference" msgstr "Référence" #: pcbnew/class_board_item.cpp:104 +#: pcbnew/class_edge_mod.cpp:287 +#: pcbnew/class_text_mod.cpp:488 +#: eeschema/component_class.cpp:73 +#: eeschema/edit_component_in_schematic.cpp:796 +#: eeschema/eelayer.h:158 msgid "Value" msgstr "Valeur" @@ -279,6 +359,8 @@ msgid " of " msgstr " de " #: pcbnew/class_board_item.cpp:109 +#: pcbnew/class_text_mod.cpp:488 +#: pcbnew/class_text_mod.cpp:497 msgid "Text" msgstr "Texte" @@ -287,31 +369,39 @@ msgid "Graphic" msgstr "Graphique" #: pcbnew/class_board_item.cpp:127 +#: pcbnew/class_track.cpp:841 +#: pcbnew/pcbframe.cpp:467 msgid "Track" msgstr "Piste" #: pcbnew/class_board_item.cpp:134 #: pcbnew/class_board_item.cpp:201 +#: pcbnew/dialog_zones_by_polygon.cpp:231 msgid "Net:" msgstr "Net:" #: pcbnew/class_board_item.cpp:139 +#: pcbnew/class_zone.cpp:601 msgid "Zone Outline" msgstr "Contour de Zone" #: pcbnew/class_board_item.cpp:144 +#: pcbnew/class_zone.cpp:605 msgid "(Cutout)" msgstr "(Cutout)" #: pcbnew/class_board_item.cpp:163 +#: pcbnew/class_zone.cpp:625 msgid "Not Found" msgstr " Non Trouvé" #: pcbnew/class_board_item.cpp:169 +#: pcbnew/class_track.cpp:845 msgid "Zone" msgstr "Zone" #: pcbnew/class_board_item.cpp:187 +#: pcbnew/pcbframe.cpp:499 msgid "Via" msgstr "Via" @@ -320,10 +410,12 @@ msgid "Blind/Buried" msgstr "Borgne/Aveugle" #: pcbnew/class_board_item.cpp:193 +#: pcbnew/pcbnew.h:292 msgid "Micro Via" msgstr "Micro Via" #: pcbnew/class_board_item.cpp:216 +#: pcbnew/class_marker.cpp:133 msgid "Marker" msgstr "Marqueur" @@ -344,6 +436,7 @@ msgstr "dimension" #: pcbnew/class_text_mod.cpp:503 #: pcbnew/class_track.cpp:852 #: pcbnew/class_zone.cpp:608 +#: gerbview/affiche.cpp:94 msgid "Type" msgstr "Type" @@ -367,6 +460,9 @@ msgstr "Segment" #: pcbnew/class_text_mod.cpp:516 #: pcbnew/class_track.cpp:909 #: pcbnew/class_zone.cpp:637 +#: pcbnew/dialog_edit_module.cpp:235 +#: pcbnew/sel_layer.cpp:146 +#: gerbview/affiche.cpp:110 msgid "Layer" msgstr "Couche" @@ -375,10 +471,19 @@ msgstr "Couche" #: pcbnew/class_pcb_text.cpp:204 #: pcbnew/class_text_mod.cpp:528 #: pcbnew/class_track.cpp:932 +#: pcbnew/cotation.cpp:129 +#: pcbnew/dialog_edit_mod_text.cpp:254 +#: pcbnew/mirepcb.cpp:113 +#: pcbnew/pcbtexte.cpp:133 +#: eeschema/affiche.cpp:187 +#: eeschema/dialog_cmp_graphic_properties.cpp:189 +#: gerbview/affiche.cpp:52 +#: gerbview/affiche.cpp:114 msgid "Width" msgstr "Epaisseur" #: pcbnew/class_drc_item.cpp:39 +#: pcbnew/dialog_drc.cpp:484 msgid "Unconnected pads" msgstr "Pads non connectés" @@ -446,6 +551,7 @@ msgstr "Seg" #: pcbnew/class_module.cpp:1107 #: pcbnew/class_pad.cpp:903 #: pcbnew/class_text_mod.cpp:494 +#: cvpcb/setvisu.cpp:31 msgid "Module" msgstr "Module" @@ -482,6 +588,9 @@ msgstr "Stat" #: pcbnew/class_pad.cpp:1035 #: pcbnew/class_pcb_text.cpp:201 #: pcbnew/class_text_mod.cpp:525 +#: pcbnew/dialog_edit_module.cpp:246 +#: eeschema/affiche.cpp:116 +#: gerbview/affiche.cpp:49 msgid "Orient" msgstr "Orient" @@ -508,12 +617,14 @@ msgstr "RefP" #: pcbnew/class_pad.cpp:1006 #: pcbnew/class_pcb_text.cpp:207 #: pcbnew/class_text_mod.cpp:531 +#: gerbview/affiche.cpp:55 msgid "H Size" msgstr "Taille H" #: pcbnew/class_pad.cpp:1010 #: pcbnew/class_pcb_text.cpp:210 #: pcbnew/class_text_mod.cpp:534 +#: gerbview/affiche.cpp:58 msgid "V Size" msgstr "Taille V" @@ -536,25 +647,38 @@ msgid "Y pos" msgstr "Y pos" #: pcbnew/class_pcb_text.cpp:186 +#: gerbview/affiche.cpp:29 msgid "COTATION" msgstr "COTATION" #: pcbnew/class_pcb_text.cpp:188 +#: gerbview/affiche.cpp:32 msgid "PCB Text" msgstr "Texte Pcb" #: pcbnew/class_pcb_text.cpp:194 #: pcbnew/class_text_mod.cpp:522 +#: pcbnew/cotation.cpp:113 +#: pcbnew/modedit_onclick.cpp:243 +#: pcbnew/pcbtexte.cpp:180 +#: gerbview/affiche.cpp:40 +#: share/dialog_print.cpp:198 msgid "Mirror" msgstr "Miroir" #: pcbnew/class_pcb_text.cpp:196 #: pcbnew/class_text_mod.cpp:506 +#: pcbnew/dialog_display_options.cpp:275 +#: eeschema/dialog_options.cpp:280 +#: gerbview/affiche.cpp:43 msgid "No" msgstr "Non" #: pcbnew/class_pcb_text.cpp:198 #: pcbnew/class_text_mod.cpp:508 +#: pcbnew/dialog_display_options.cpp:274 +#: eeschema/dialog_options.cpp:279 +#: gerbview/affiche.cpp:45 msgid "Yes" msgstr "Oui" @@ -563,11 +687,19 @@ msgid "Ref." msgstr "Ref." #: pcbnew/class_text_mod.cpp:509 +#: pcbnew/cotation.cpp:114 +#: pcbnew/dialog_edit_mod_text.cpp:291 +#: pcbnew/dialog_general_options.cpp:289 +#: pcbnew/pcbtexte.cpp:181 +#: eeschema/affiche.cpp:91 +#: gerbview/options.cpp:176 +#: gerbview/tool_gerber.cpp:113 msgid "Display" msgstr "Affichage" #: pcbnew/class_track.cpp:868 #: pcbnew/class_zone.cpp:628 +#: pcbnew/zones_by_polygon.cpp:859 msgid "NetName" msgstr "NetName" @@ -577,6 +709,7 @@ msgid "NetCode" msgstr "NetCode" #: pcbnew/class_track.cpp:881 +#: pcbnew/dialog_pad_edit.cpp:205 msgid "Standard" msgstr "Standard" @@ -613,6 +746,10 @@ msgid "Merge" msgstr "Merge" #: pcbnew/clean.cpp:464 +#: pcbnew/dialog_pad_edit.cpp:186 +#: eeschema/dialog_edit_component_in_schematic.cpp:172 +#: eeschema/dialog_erc.cpp:193 +#: eeschema/dialog_erc.cpp:197 msgid "0" msgstr "0" @@ -689,6 +826,7 @@ msgid "Clean pcb" msgstr "Nettoyage PCB" #: pcbnew/controle.cpp:172 +#: pcbnew/modedit.cpp:77 msgid "Selection Clarification" msgstr "Clarification de la Sélection" @@ -699,14 +837,29 @@ msgstr "Propriétés des Cotes" #: pcbnew/cotation.cpp:113 #: pcbnew/dialog_edit_module.cpp:243 #: pcbnew/dialog_edit_module.cpp:289 +#: pcbnew/muonde.cpp:360 +#: pcbnew/pcbtexte.cpp:180 +#: eeschema/dialog_edit_component_in_schematic.cpp:181 +#: eeschema/dialog_options.cpp:247 +#: eeschema/onrightclick.cpp:293 msgid "Normal" msgstr "Normal" #: pcbnew/cotation.cpp:125 +#: pcbnew/mirepcb.cpp:108 +#: pcbnew/muonde.cpp:367 +#: pcbnew/pcbtexte.cpp:129 +#: eeschema/sheet.cpp:177 +#: eeschema/sheet.cpp:183 +#: eeschema/pinedit-dialog.cpp:208 +#: eeschema/pinedit-dialog.cpp:214 +#: common/wxwineda.cpp:91 msgid "Size" msgstr "Taille " #: pcbnew/cotation.cpp:133 +#: pcbnew/dialog_zones_by_polygon.cpp:238 +#: gerbview/affiche.cpp:37 msgid "Layer:" msgstr "Couche:" @@ -744,6 +897,9 @@ msgstr "Pistes et vias" #: pcbnew/dialog_display_options.cpp:231 #: pcbnew/dialog_display_options.cpp:244 #: pcbnew/dialog_display_options.cpp:268 +#: pcbnew/pcbplot.cpp:415 +#: gerbview/options.cpp:298 +#: gerbview/options.cpp:321 msgid "Sketch" msgstr "Contour" @@ -752,6 +908,10 @@ msgstr "Contour" #: pcbnew/dialog_display_options.cpp:230 #: pcbnew/dialog_display_options.cpp:245 #: pcbnew/dialog_display_options.cpp:267 +#: pcbnew/pcbplot.cpp:415 +#: eeschema/dialog_cmp_graphic_properties.cpp:169 +#: gerbview/options.cpp:298 +#: gerbview/options.cpp:321 msgid "Filled" msgstr "Plein" @@ -822,10 +982,12 @@ msgid "Show Pad NoConnect" msgstr "Montrer non conn" #: pcbnew/dialog_display_options.cpp:269 +#: gerbview/options.cpp:322 msgid "Display other items:" msgstr "Afficher autres éléments" #: pcbnew/dialog_display_options.cpp:276 +#: eeschema/dialog_options.cpp:281 msgid "Show page limits" msgstr " Afficher limites de page" @@ -835,6 +997,24 @@ msgstr " Afficher limites de page" #: pcbnew/dialog_general_options.cpp:479 #: pcbnew/dialog_graphic_items_options.cpp:263 #: pcbnew/dialog_initpcb.cpp:161 +#: pcbnew/dialog_track_options.cpp:322 +#: pcbnew/set_grid.cpp:171 +#: pcbnew/swap_layers.cpp:223 +#: pcbnew/dialog_pad_edit.cpp:215 +#: eeschema/dialog_build_BOM.cpp:344 +#: eeschema/dialog_cmp_graphic_properties.cpp:178 +#: eeschema/dialog_create_component.cpp:198 +#: eeschema/dialog_edit_component_in_lib.cpp:221 +#: eeschema/dialog_edit_component_in_schematic.cpp:241 +#: eeschema/dialog_edit_label.cpp:181 +#: eeschema/dialog_options.cpp:288 +#: eeschema/sheet.cpp:198 +#: eeschema/symbtext.cpp:177 +#: eeschema/pinedit-dialog.cpp:242 +#: cvpcb/dialog_display_options.cpp:187 +#: cvpcb/dialog_cvpcb_config.cpp:138 +#: gerbview/select_layers_to_pcb.cpp:285 +#: share/setpage.cpp:444 msgid "&OK" msgstr "&OK" @@ -844,15 +1024,39 @@ msgstr "&OK" #: pcbnew/dialog_general_options.cpp:485 #: pcbnew/dialog_graphic_items_options.cpp:267 #: pcbnew/dialog_initpcb.cpp:164 +#: pcbnew/dialog_track_options.cpp:328 +#: pcbnew/dialog_zones_by_polygon.cpp:207 +#: pcbnew/set_grid.cpp:176 +#: pcbnew/swap_layers.cpp:227 +#: pcbnew/dialog_pad_edit.cpp:219 +#: eeschema/dialog_cmp_graphic_properties.cpp:183 +#: eeschema/dialog_create_component.cpp:203 +#: eeschema/dialog_edit_component_in_lib.cpp:217 +#: eeschema/dialog_edit_component_in_schematic.cpp:233 +#: eeschema/dialog_edit_label.cpp:186 +#: eeschema/dialog_options.cpp:293 +#: eeschema/netlist_control.cpp:144 +#: eeschema/netlist_control.cpp:267 +#: eeschema/sheet.cpp:194 +#: eeschema/symbtext.cpp:182 +#: eeschema/pinedit-dialog.cpp:238 +#: cvpcb/dialog_display_options.cpp:192 +#: gerbview/select_layers_to_pcb.cpp:289 +#: share/setpage.cpp:448 msgid "&Cancel" msgstr "&Annuler" #: pcbnew/dialog_drc.cpp:430 #: pcbnew/dialog_netlist.cpp:193 +#: eeschema/dialog_create_component.cpp:179 +#: eeschema/dialog_edit_component_in_lib.cpp:169 +#: eeschema/dialog_edit_component_in_schematic.cpp:202 +#: eeschema/dialog_erc.cpp:239 msgid "Options" msgstr "Options" #: pcbnew/dialog_drc.cpp:440 +#: pcbnew/dialog_track_options.cpp:290 msgid "Clearance" msgstr "Isolation" @@ -893,6 +1097,7 @@ msgid "Include tests for clearances between pad to pads" msgstr "Inclure test de l'isolation entre pads" #: pcbnew/dialog_drc.cpp:478 +#: pcbnew/onrightclick.cpp:646 msgid "Zones" msgstr "Zones" @@ -990,10 +1195,13 @@ msgid "Change module(s)" msgstr "Change module(s)" #: pcbnew/dialog_edit_module.cpp:186 +#: pcbnew/modedit_onclick.cpp:250 msgid "Edit Module" msgstr "Edit Module" #: pcbnew/dialog_edit_module.cpp:193 +#: eeschema/dialog_edit_component_in_lib.cpp:206 +#: eeschema/onrightclick.cpp:343 msgid "Doc" msgstr "Doc" @@ -1010,6 +1218,7 @@ msgid "Add Field" msgstr "Ajouter Champ" #: pcbnew/dialog_edit_module.cpp:222 +#: eeschema/onrightclick.cpp:248 msgid "Edit Field" msgstr "Editer Champ" @@ -1018,6 +1227,7 @@ msgid "Delete Field" msgstr "Supprimer Champ" #: pcbnew/dialog_edit_module.cpp:234 +#: common/common.cpp:352 msgid "Component" msgstr "Composant" @@ -1026,6 +1236,7 @@ msgid "Copper" msgstr "Cuivre" #: pcbnew/dialog_edit_module.cpp:243 +#: pcbnew/dialog_pad_edit.cpp:190 msgid "User" msgstr "User" @@ -1094,6 +1305,7 @@ msgid "3D Shape Name" msgstr "3D forme" #: pcbnew/dialog_edit_module.cpp:395 +#: eeschema/dialog_eeschema_config.cpp:231 msgid "Browse" msgstr "Examiner" @@ -1164,6 +1376,7 @@ msgid "vertical" msgstr "Vertical" #: pcbnew/dialog_edit_mod_text.cpp:282 +#: pcbnew/pcbtexte.cpp:156 msgid "Orientation" msgstr "Orientation" @@ -1180,6 +1393,9 @@ msgid "Value:" msgstr "Valeur:" #: pcbnew/dialog_edit_mod_text.cpp:384 +#: pcbnew/pcbtexte.cpp:123 +#: eeschema/sheetlab.cpp:102 +#: common/confirm.cpp:145 msgid "Text:" msgstr "Texte:" @@ -1225,38 +1441,53 @@ msgstr "L' URL du site FreeRouting.net" #: pcbnew/dialog_freeroute_exchange.cpp:222 #: pcbnew/dialog_netlist.cpp:253 +#: eeschema/dialog_build_BOM.cpp:348 +#: eeschema/dialog_erc.cpp:219 +#: eeschema/plothpgl.cpp:292 +#: share/dialog_print.cpp:242 msgid "&Close" msgstr "&Fermer" #: pcbnew/dialog_general_options.cpp:288 +#: gerbview/options.cpp:175 msgid "No Display" msgstr "Pas d'affichage" #: pcbnew/dialog_general_options.cpp:291 +#: gerbview/options.cpp:177 msgid "Display Polar Coord" msgstr "Affichage coord Polaires" #: pcbnew/dialog_general_options.cpp:299 +#: pcbnew/set_grid.cpp:147 +#: pcbnew/dialog_gendrill.cpp:167 +#: gerbview/options.cpp:185 msgid "Inches" msgstr "Pouces" #: pcbnew/dialog_general_options.cpp:300 +#: gerbview/options.cpp:186 msgid "millimeters" msgstr "millimetres" #: pcbnew/dialog_general_options.cpp:302 +#: eeschema/dialog_options.cpp:264 +#: gerbview/options.cpp:187 msgid "Units" msgstr "Unités" #: pcbnew/dialog_general_options.cpp:309 +#: gerbview/options.cpp:193 msgid "Small" msgstr "Petit" #: pcbnew/dialog_general_options.cpp:310 +#: gerbview/options.cpp:193 msgid "Big" msgstr "Grand" #: pcbnew/dialog_general_options.cpp:312 +#: gerbview/options.cpp:194 msgid "Cursor" msgstr "Curseur" @@ -1273,6 +1504,10 @@ msgid "Auto Save (minuts):" msgstr "Sauveg. Auto (min)" #: pcbnew/dialog_general_options.cpp:376 +#: pcbnew/dialog_gendrill.cpp:239 +#: eeschema/dialog_build_BOM.cpp:283 +#: eeschema/netlist_control.cpp:121 +#: share/dialog_print.cpp:187 msgid "Options:" msgstr "Options :" @@ -1301,6 +1536,7 @@ msgid "Segments 45 Only" msgstr "Segments 45 seulement" #: pcbnew/dialog_general_options.cpp:429 +#: eeschema/dialog_options.cpp:256 msgid "Auto PAN" msgstr "Auto PAN" @@ -1457,6 +1693,13 @@ msgid "Keep or change an existing footprint when the netlist gives a different f msgstr "Garder ou changer une empreinte existante quand la netliste donne une empreinte différente" #: pcbnew/dialog_netlist.cpp:186 +#: pcbnew/onrightclick.cpp:581 +#: pcbnew/onrightclick.cpp:762 +#: pcbnew/onrightclick.cpp:817 +#: pcbnew/onrightclick.cpp:866 +#: eeschema/edit_component_in_lib.cpp:239 +#: eeschema/edit_component_in_lib.cpp:320 +#: eeschema/menubar.cpp:146 msgid "Delete" msgstr "Supprimer" @@ -1509,6 +1752,11 @@ msgid "Rebuild the full ratsnest (usefull after a manual pad netname edition)" msgstr "Recalculer le chevelu complet ( utile après une edition manuelle de nom de net sur pad)" #: pcbnew/dialog_netlist.cpp:232 +#: pcbnew/pcbplot.cpp:284 +#: pcbnew/xchgmod.cpp:137 +#: eeschema/annotate_dialog.cpp:230 +#: eeschema/plotps.cpp:227 +#: share/zoom.cpp:449 msgid "Close" msgstr "Fermer" @@ -1558,30 +1806,50 @@ msgid "Bad value for footprints orientation" msgstr "Mauvaise valeur pour l'orientation des empreintes" #: pcbnew/dialog_setup_libs.cpp:97 +#: eeschema/dialog_eeschema_config.cpp:105 +#: cvpcb/dialog_cvpcb_config.cpp:75 +#: gerbview/reglage.cpp:90 msgid "from " msgstr "De " #: pcbnew/dialog_setup_libs.cpp:153 +#: eeschema/dialog_eeschema_config.cpp:161 +#: cvpcb/dialog_display_options.cpp:178 +#: cvpcb/dialog_cvpcb_config.cpp:128 msgid "Save Cfg" msgstr "Sauver config" #: pcbnew/dialog_setup_libs.cpp:159 +#: eeschema/dialog_eeschema_config.cpp:178 +#: cvpcb/dialog_cvpcb_config.cpp:143 msgid "Files ext:" msgstr "Ext. Fichiers" #: pcbnew/dialog_setup_libs.cpp:175 +#: cvpcb/dialog_cvpcb_config.cpp:162 +#: cvpcb/dialog_cvpcb_config.cpp:194 msgid "Del" msgstr "Supprimer" #: pcbnew/dialog_setup_libs.cpp:179 +#: eeschema/dialog_eeschema_config.cpp:197 +#: eeschema/edit_component_in_lib.cpp:233 +#: eeschema/edit_component_in_lib.cpp:312 +#: cvpcb/dialog_cvpcb_config.cpp:166 +#: cvpcb/dialog_cvpcb_config.cpp:198 msgid "Add" msgstr "Ajouter" #: pcbnew/dialog_setup_libs.cpp:183 +#: eeschema/dialog_eeschema_config.cpp:203 +#: cvpcb/dialog_cvpcb_config.cpp:170 +#: cvpcb/dialog_cvpcb_config.cpp:202 msgid "Ins" msgstr "Insérer" #: pcbnew/dialog_setup_libs.cpp:191 +#: eeschema/dialog_eeschema_config.cpp:213 +#: cvpcb/dialog_cvpcb_config.cpp:177 msgid "Libraries" msgstr "Librairies" @@ -1590,6 +1858,7 @@ msgid "Lib Modules Dir:" msgstr "Repertoire Lib Modules:" #: pcbnew/dialog_setup_libs.cpp:206 +#: cvpcb/menucfg.cpp:62 msgid "Module Doc File:" msgstr "Fichiers Doc des Modules" @@ -1610,10 +1879,14 @@ msgid "Net ext: " msgstr "Net ext: " #: pcbnew/dialog_setup_libs.cpp:367 +#: cvpcb/menucfg.cpp:202 msgid "Library Files:" msgstr "Fichiers Librairies:" #: pcbnew/dialog_setup_libs.cpp:392 +#: eeschema/dialog_eeschema_config.cpp:394 +#: cvpcb/menucfg.cpp:227 +#: cvpcb/menucfg.cpp:295 msgid "Library already in use" msgstr "Librairie déjà en usage" @@ -1634,6 +1907,7 @@ msgid "Alternate Via Drill" msgstr "Perçage vias alternatif" #: pcbnew/dialog_track_options.cpp:208 +#: pcbnew/pcbnew.h:294 msgid "Through Via" msgstr "Via Traversante" @@ -1646,6 +1920,7 @@ msgid "Default Via Type" msgstr "Via par Défaut" #: pcbnew/dialog_track_options.cpp:223 +#: pcbnew/dialog_gendrill.cpp:284 msgid "Micro Vias:" msgstr "Micro Vias:" @@ -1722,6 +1997,7 @@ msgid "Pad options:" msgstr "Options pads" #: pcbnew/dialog_zones_by_polygon.cpp:193 +#: eeschema/dialog_options.cpp:273 msgid "Any" msgstr "Tout" @@ -1835,6 +2111,10 @@ msgid "Add Graphic" msgstr "Addition éléments graphiques" #: pcbnew/edit.cpp:290 +#: pcbnew/tool_modedit.cpp:171 +#: eeschema/libframe.cpp:501 +#: eeschema/schedit.cpp:217 +#: gerbview/tool_gerber.cpp:385 msgid "Add Text" msgstr "Ajout de Texte" @@ -1855,6 +2135,9 @@ msgid "Local Ratsnest" msgstr "Monter le chevelu général" #: pcbnew/edit.cpp:552 +#: pcbnew/modedit.cpp:424 +#: eeschema/libframe.cpp:577 +#: eeschema/schedit.cpp:366 msgid "Delete item" msgstr "Suppression d'éléments" @@ -1944,6 +2227,20 @@ msgid "GenCAD file:" msgstr "Fichier GenCAD:" #: pcbnew/export_gencad.cpp:83 +#: pcbnew/files.cpp:352 +#: pcbnew/gen_modules_placefile.cpp:128 +#: pcbnew/gen_modules_placefile.cpp:139 +#: pcbnew/gen_modules_placefile.cpp:292 +#: pcbnew/librairi.cpp:308 +#: pcbnew/librairi.cpp:454 +#: pcbnew/librairi.cpp:604 +#: pcbnew/librairi.cpp:808 +#: pcbnew/plothpgl.cpp:67 +#: eeschema/plothpgl.cpp:601 +#: eeschema/plotps.cpp:433 +#: cvpcb/genequiv.cpp:42 +#: gerbview/export_to_pcbnew.cpp:75 +#: common/hotkeys_basic.cpp:385 msgid "Unable to create " msgstr "Impossible de créer " @@ -1953,6 +2250,12 @@ msgstr "Fichier de secours " #: pcbnew/files.cpp:56 #: pcbnew/librairi.cpp:256 +#: eeschema/find.cpp:241 +#: eeschema/find.cpp:249 +#: eeschema/find.cpp:695 +#: gerbview/dcode.cpp:266 +#: gerbview/readgerb.cpp:145 +#: common/eda_doc.cpp:150 msgid " not found" msgstr " non trouvé" @@ -1970,6 +2273,7 @@ msgstr "Charger Fichiers C.I.:" #: pcbnew/files.cpp:188 #: pcbnew/librairi.cpp:77 +#: cvpcb/readschematicnetlist.cpp:110 #, c-format msgid "File <%s> not found" msgstr " fichier %s non trouvé" @@ -2021,6 +2325,7 @@ msgid "<%s> Not Found" msgstr "<%s> Non trouvé" #: pcbnew/find.cpp:238 +#: eeschema/dialog_find.cpp:117 msgid "Item to find:" msgstr "Elément a chercher:" @@ -2046,14 +2351,18 @@ msgstr "Fichier de percage" #: pcbnew/gendrill.cpp:322 #: pcbnew/gendrill.cpp:789 +#: pcbnew/plotps.cpp:51 +#: pcbnew/xchgmod.cpp:637 msgid "Unable to create file " msgstr "Impossible de créer le fichier " #: pcbnew/gendrill.cpp:378 +#: pcbnew/dialog_gendrill.cpp:184 msgid "2:3" msgstr "2:3" #: pcbnew/gendrill.cpp:379 +#: pcbnew/dialog_gendrill.cpp:185 msgid "2:4" msgstr "2:4" @@ -2179,6 +2488,7 @@ msgid "Delete draw items?" msgstr "Suppression éléments graphiques?" #: pcbnew/initpcb.cpp:249 +#: gerbview/initpcb.cpp:150 msgid "Delete Tracks?" msgstr "Effacer Pistes ?" @@ -2187,6 +2497,7 @@ msgid "Delete Modules?" msgstr "Effacement des Modules?" #: pcbnew/initpcb.cpp:295 +#: gerbview/initpcb.cpp:173 msgid "Delete Pcb Texts" msgstr "Effacer Textes Pcb" @@ -2217,6 +2528,7 @@ msgid "File %s exists, OK to replace ?" msgstr "Fichier %s existant, OK pour remplacer ?" #: pcbnew/librairi.cpp:203 +#: eeschema/symbedit.cpp:166 #, c-format msgid "Unable to create <%s>" msgstr "Incapable de créer <%s>" @@ -2263,6 +2575,8 @@ msgid "Library %s not found" msgstr "Librairie %s non trouvée" #: pcbnew/librairi.cpp:527 +#: eeschema/symbtext.cpp:143 +#: common/get_component_dialog.cpp:98 msgid "Name:" msgstr "Nom:" @@ -2317,6 +2631,7 @@ msgid "Module name:" msgstr "Nom module:" #: pcbnew/loadcmp.cpp:215 +#: eeschema/eelibs_read_libraryfiles.cpp:64 #, c-format msgid "Library <%s> not found" msgstr "Librairie %s non trouvée" @@ -2357,6 +2672,7 @@ msgstr "Ajuster dims pour textes et graphiques" #: pcbnew/menubarmodedit.cpp:45 #: pcbnew/menubarpcb.cpp:233 #: pcbnew/modedit.cpp:396 +#: pcbnew/tool_modedit.cpp:124 msgid "Pad Settings" msgstr "Caract pads" @@ -2367,6 +2683,7 @@ msgstr "Ajuster taille, forme, couches... pour pads" #: pcbnew/menubarmodedit.cpp:50 #: pcbnew/menubarpcb.cpp:223 +#: pcbnew/set_grid.h:39 msgid "User Grid Size" msgstr "Dim Grille utilisteur" @@ -2377,6 +2694,10 @@ msgstr "Ajuster Grille utilisateur" #: pcbnew/menubarmodedit.cpp:60 #: pcbnew/menubarpcb.cpp:292 +#: eeschema/menubar.cpp:397 +#: cvpcb/tool_cvpcb.cpp:155 +#: kicad/buildmnu.cpp:190 +#: gerbview/tool_gerber.cpp:149 msgid "&Contents" msgstr "&Contenu" @@ -2387,11 +2708,19 @@ msgstr "Ouvrir la documentation de pcbnew" #: pcbnew/menubarmodedit.cpp:64 #: pcbnew/menubarpcb.cpp:296 +#: eeschema/menubar.cpp:402 +#: cvpcb/tool_cvpcb.cpp:159 +#: kicad/buildmnu.cpp:195 +#: gerbview/tool_gerber.cpp:151 msgid "&About" msgstr "&Infos logiciel" #: pcbnew/menubarmodedit.cpp:64 #: pcbnew/menubarpcb.cpp:296 +#: eeschema/menubar.cpp:402 +#: cvpcb/tool_cvpcb.cpp:160 +#: kicad/buildmnu.cpp:195 +#: gerbview/tool_gerber.cpp:152 msgid "About this application" msgstr "Au sujet de cette application" @@ -2417,6 +2746,10 @@ msgstr "&3D Visu" #: pcbnew/menubarmodedit.cpp:78 #: pcbnew/menubarpcb.cpp:314 +#: eeschema/menubar.cpp:412 +#: cvpcb/tool_cvpcb.cpp:166 +#: kicad/buildmnu.cpp:203 +#: gerbview/tool_gerber.cpp:159 msgid "&Help" msgstr "&Aide" @@ -2477,14 +2810,19 @@ msgid "Save current board as.." msgstr "Sauver le Circuit Imprimé courant sous.." #: pcbnew/menubarpcb.cpp:84 +#: eeschema/menubar.cpp:75 +#: gerbview/tool_gerber.cpp:88 msgid "P&rint" msgstr "Imp&rimer" #: pcbnew/menubarpcb.cpp:84 +#: eeschema/menubar.cpp:75 +#: gerbview/tool_gerber.cpp:88 msgid "Print on current printer" msgstr "Imprimer sur l'imprimante par défaut" #: pcbnew/menubarpcb.cpp:89 +#: eeschema/menubar.cpp:105 msgid "&Plot" msgstr "&Tracer" @@ -2533,6 +2871,7 @@ msgid "Import a routed \"Specctra Session\" (*.ses) file" msgstr "Importer un fichier de routage \"Specctra Session\" (*.ses) " #: pcbnew/menubarpcb.cpp:133 +#: eeschema/libframe.cpp:525 msgid "Import" msgstr "Importer" @@ -2565,6 +2904,10 @@ msgid "Archive or Add footprints in a library file" msgstr "Archiver ou ajouter les modules dans un fichier librairie" #: pcbnew/menubarpcb.cpp:156 +#: eeschema/menubar.cpp:109 +#: cvpcb/tool_cvpcb.cpp:122 +#: kicad/buildmnu.cpp:122 +#: gerbview/tool_gerber.cpp:93 msgid "E&xit" msgstr "&Quitter" @@ -2573,14 +2916,19 @@ msgid "Quit pcbnew" msgstr "Quitter Pcbnew" #: pcbnew/menubarpcb.cpp:174 +#: eeschema/menubar.cpp:358 msgid "&Libs and Dir" msgstr "&Libs et Rep" #: pcbnew/menubarpcb.cpp:175 +#: eeschema/menubar.cpp:359 +#: cvpcb/tool_cvpcb.cpp:137 msgid "Setting Libraries, Directories and others..." msgstr "Sélectionner les librairies et répertoires" #: pcbnew/menubarpcb.cpp:179 +#: eeschema/menubar.cpp:364 +#: gerbview/tool_gerber.cpp:108 msgid "&Colors" msgstr "&Couleurs" @@ -2605,18 +2953,23 @@ msgid "Select what items are displayed" msgstr "Sélectionner les éléments a afficher" #: pcbnew/menubarpcb.cpp:200 +#: eeschema/menubar.cpp:382 msgid "&Save preferences" msgstr "&Sauver Préférences" #: pcbnew/menubarpcb.cpp:201 +#: eeschema/menubar.cpp:383 +#: gerbview/tool_gerber.cpp:123 msgid "Save application preferences" msgstr "Sauver préférences" #: pcbnew/menubarpcb.cpp:205 +#: eeschema/menubar.cpp:386 msgid "&Read preferences" msgstr "&Lire Préférences" #: pcbnew/menubarpcb.cpp:206 +#: eeschema/menubar.cpp:387 msgid "Read application preferences" msgstr "Lire préférences de l'application" @@ -2629,10 +2982,12 @@ msgid "Adjust size and width for tracks, vias" msgstr "Ajuster dims et taille des pistes et vias" #: pcbnew/menubarpcb.cpp:228 +#: pcbnew/dialog_graphic_items_options.h:47 msgid "Texts and Drawings" msgstr "Textes et Tracés" #: pcbnew/menubarpcb.cpp:239 +#: gerbview/tool_gerber.cpp:122 msgid "&Save Setup" msgstr "&Sauver Options" @@ -2697,14 +3052,24 @@ msgid "Swap tracks on copper layers or drawings on others layers" msgstr "Permutation de couches" #: pcbnew/menubarpcb.cpp:308 +#: eeschema/menubar.cpp:407 +#: cvpcb/tool_cvpcb.cpp:164 +#: gerbview/tool_gerber.cpp:154 +#: 3d-viewer/3d_toolbar.cpp:116 msgid "&File" msgstr "&Fichiers" #: pcbnew/menubarpcb.cpp:309 +#: eeschema/menubar.cpp:411 +#: cvpcb/tool_cvpcb.cpp:165 +#: kicad/buildmnu.cpp:202 +#: gerbview/tool_gerber.cpp:155 +#: 3d-viewer/3d_toolbar.cpp:124 msgid "&Preferences" msgstr "&Préférences" #: pcbnew/menubarpcb.cpp:311 +#: gerbview/tool_gerber.cpp:156 msgid "&Miscellaneous" msgstr "&Divers" @@ -2757,30 +3122,50 @@ msgid "Add Pad" msgstr "Ajouter Pastilles" #: pcbnew/modedit.cpp:406 +#: eeschema/schedit.cpp:197 msgid "Add Drawing" msgstr "Ajout d'éléments graphiques" #: pcbnew/modedit.cpp:410 +#: pcbnew/tool_modedit.cpp:176 msgid "Place anchor" msgstr "Place Ancre" #: pcbnew/modedit_onclick.cpp:196 +#: pcbnew/onrightclick.cpp:127 +#: eeschema/libedit_onrightclick.cpp:47 +#: eeschema/onrightclick.cpp:102 +#: gerbview/onrightclick.cpp:41 msgid "End Tool" msgstr "Fin Outil" #: pcbnew/modedit_onclick.cpp:206 +#: pcbnew/onrightclick.cpp:447 +#: eeschema/libedit_onrightclick.cpp:231 +#: eeschema/onrightclick.cpp:609 +#: gerbview/onrightclick.cpp:50 msgid "Cancel Block" msgstr "Annuler Bloc" #: pcbnew/modedit_onclick.cpp:208 +#: pcbnew/onrightclick.cpp:449 +#: eeschema/libedit_onrightclick.cpp:234 +#: gerbview/onrightclick.cpp:51 msgid "Zoom Block (drag middle mouse)" msgstr "Zoom Bloc (drag bouton du milieu souris)" #: pcbnew/modedit_onclick.cpp:211 +#: pcbnew/onrightclick.cpp:452 +#: eeschema/libedit_onrightclick.cpp:238 +#: eeschema/onrightclick.cpp:617 +#: gerbview/onrightclick.cpp:53 msgid "Place Block" msgstr "Place Bloc" #: pcbnew/modedit_onclick.cpp:213 +#: pcbnew/onrightclick.cpp:454 +#: eeschema/libedit_onrightclick.cpp:244 +#: eeschema/onrightclick.cpp:626 msgid "Copy Block (shift + drag mouse)" msgstr "Copie Bloc (shift + drag mouse)" @@ -2789,14 +3174,19 @@ msgid "Mirror Block (alt + drag mouse)" msgstr "Bloc Miroir (alt + drag mouse)" #: pcbnew/modedit_onclick.cpp:217 +#: pcbnew/onrightclick.cpp:458 msgid "Rotate Block (ctrl + drag mouse)" msgstr "Rotation Bloc (ctrl + drag mouse)" #: pcbnew/modedit_onclick.cpp:219 +#: pcbnew/onrightclick.cpp:460 +#: eeschema/onrightclick.cpp:630 msgid "Delete Block (shift+ctrl + drag mouse)" msgstr "Effacement Bloc (shift+ctrl + drag mouse)" #: pcbnew/modedit_onclick.cpp:241 +#: pcbnew/onrightclick.cpp:756 +#: pcbnew/onrightclick.cpp:860 msgid "Rotate" msgstr "Rotation" @@ -2821,14 +3211,17 @@ msgid "Move Pad" msgstr "Déplace Pad" #: pcbnew/modedit_onclick.cpp:263 +#: pcbnew/onrightclick.cpp:795 msgid "Edit Pad" msgstr "Edit Pad" #: pcbnew/modedit_onclick.cpp:265 +#: pcbnew/onrightclick.cpp:799 msgid "New Pad Settings" msgstr "Nouvelles Caract. Pads" #: pcbnew/modedit_onclick.cpp:267 +#: pcbnew/onrightclick.cpp:803 msgid "Export Pad Settings" msgstr "Exporte Caract. Pads" @@ -2837,6 +3230,7 @@ msgid "delete Pad" msgstr "Supprimer Pad" #: pcbnew/modedit_onclick.cpp:274 +#: pcbnew/onrightclick.cpp:810 msgid "Global Pad Settings" msgstr "Edition Globale des pads" @@ -2869,6 +3263,10 @@ msgid "Place edge" msgstr "Place contour" #: pcbnew/modedit_onclick.cpp:306 +#: pcbnew/onrightclick.cpp:724 +#: pcbnew/onrightclick.cpp:758 +#: pcbnew/onrightclick.cpp:862 +#: eeschema/onrightclick.cpp:300 msgid "Edit" msgstr "Editer" @@ -2905,10 +3303,13 @@ msgid "Footprint name:" msgstr "Nom Module: " #: pcbnew/modules.cpp:305 +#: pcbnew/onrightclick.cpp:730 msgid "Delete Module" msgstr "Supprimer Module" #: pcbnew/modules.cpp:306 +#: eeschema/find.cpp:220 +#: eeschema/onrightclick.cpp:304 msgid "Value " msgstr "Valeur " @@ -2938,6 +3339,7 @@ msgid "Arc Stub" msgstr "Arc Stub" #: pcbnew/muonde.cpp:175 +#: common/common.cpp:97 msgid " (mm):" msgstr " (mm):" @@ -2947,6 +3349,7 @@ msgstr " (pouce):" #: pcbnew/muonde.cpp:189 #: pcbnew/muonde.cpp:202 +#: pcbnew/gen_self.h:231 msgid "Incorrect number, abort" msgstr "Nombre incorrect, arret" @@ -3007,6 +3410,7 @@ msgid "Gap (inch):" msgstr "Gap (inch):" #: pcbnew/muwave_command.cpp:52 +#: eeschema/libframe.cpp:517 msgid "Add Line" msgstr "Addition de lignes" @@ -3109,20 +3513,26 @@ msgid "Cotation not authorized on Copper layers" msgstr "Cotation non autorisée sur Couches Cuivre" #: pcbnew/pcbcfg.cpp:71 +#: eeschema/eeconfig.cpp:60 +#: cvpcb/menucfg.cpp:140 msgid "Read config file" msgstr "Lire config" #: pcbnew/pcbcfg.cpp:85 +#: cvpcb/menucfg.cpp:152 #, c-format msgid "File %s not found" msgstr " fichier %s non trouvé" #: pcbnew/pcbcfg.cpp:204 +#: eeschema/eeconfig.cpp:199 +#: cvpcb/cfg.cpp:75 msgid "Save preferences" msgstr "Sauver préférences" #: pcbnew/pcbplot.cpp:147 #: pcbnew/pcbplot.cpp:272 +#: gerbview/tool_gerber.cpp:90 msgid "Plot" msgstr "Tracer" @@ -3179,6 +3589,7 @@ msgid "X scale adjust" msgstr "Ajustage Echelle X" #: pcbnew/pcbplot.cpp:259 +#: share/wxprint.cpp:189 msgid "Set X scale adjust for exact scale plotting" msgstr "Ajuster échelle X pour traçage à l'échelle exacte" @@ -3187,6 +3598,7 @@ msgid "Y scale adjust" msgstr "Ajustage Echelle Y" #: pcbnew/pcbplot.cpp:264 +#: share/wxprint.cpp:190 msgid "Set Y scale adjust for exact scale plotting" msgstr "Ajuster échelle Y pour traçage à l'échelle exacte" @@ -3207,6 +3619,7 @@ msgid "Exclude Edges_Pcb layer" msgstr "Exclure Couche Contours PCB" #: pcbnew/pcbplot.cpp:332 +#: share/dialog_print.cpp:149 msgid "Exclude contents of Edges_Pcb layer from all other layers" msgstr "Exclure les tracés contour PCB des autres couches" @@ -3291,10 +3704,12 @@ msgid "Scale 1.5" msgstr "Echelle 1,5" #: pcbnew/pcbplot.cpp:406 +#: share/dialog_print.cpp:163 msgid "Scale 2" msgstr "Echelle 2" #: pcbnew/pcbplot.cpp:406 +#: share/dialog_print.cpp:164 msgid "Scale 3" msgstr "Echelle 3" @@ -3403,10 +3818,13 @@ msgstr "Attention: Les couches dessus et dessous sont les mêmes" #: pcbnew/set_color.cpp:269 #: pcbnew/set_color.cpp:296 +#: gerbview/set_color.cpp:258 +#: gerbview/set_color.cpp:285 msgid "Show None" msgstr "Rien Afficher" #: pcbnew/set_color.cpp:278 +#: gerbview/set_color.cpp:267 msgid "Show All" msgstr "Tout Afficher" @@ -3419,10 +3837,13 @@ msgid "Switch off all of the copper layers" msgstr "N'affiche pas les couches cuivre" #: pcbnew/set_color.cpp:361 +#: eeschema/eelayer.cpp:260 +#: gerbview/set_color.cpp:333 msgid "Apply" msgstr "Appliquer" #: pcbnew/set_grid.cpp:148 +#: share/drawframe.cpp:377 msgid "mm" msgstr "mm" @@ -3551,6 +3972,7 @@ msgid "Deselect this layer to select the No Change state" msgstr "Deselectionner cette couche pour restorer l'option Pas de Changement" #: pcbnew/tool_modedit.cpp:44 +#: eeschema/tool_lib.cpp:120 msgid "Select working library" msgstr "Sélection de la librairie de travail" @@ -3596,10 +4018,16 @@ msgid "export module" msgstr "Exporter Module" #: pcbnew/tool_modedit.cpp:92 +#: eeschema/menubar.cpp:130 +#: eeschema/tool_lib.cpp:147 +#: eeschema/tool_sch.cpp:74 msgid "Undo last edition" msgstr "Defait dernière édition" #: pcbnew/tool_modedit.cpp:94 +#: eeschema/menubar.cpp:138 +#: eeschema/tool_lib.cpp:149 +#: eeschema/tool_sch.cpp:77 msgid "Redo the last undo command" msgstr "Refait la dernière commande defaite" @@ -3613,21 +4041,35 @@ msgstr "Imprimer Module" #: pcbnew/tool_modedit.cpp:106 #: pcbnew/tool_pcb.cpp:255 +#: eeschema/tool_lib.cpp:167 +#: eeschema/tool_sch.cpp:92 +#: gerbview/tool_gerber.cpp:271 msgid "zoom +" msgstr "zoom +" #: pcbnew/tool_modedit.cpp:110 #: pcbnew/tool_pcb.cpp:259 +#: eeschema/tool_lib.cpp:171 +#: eeschema/tool_sch.cpp:96 +#: gerbview/tool_gerber.cpp:278 msgid "zoom -" msgstr "zoom -" #: pcbnew/tool_modedit.cpp:114 #: pcbnew/tool_pcb.cpp:263 +#: eeschema/menubar.cpp:193 +#: eeschema/tool_lib.cpp:175 +#: eeschema/tool_sch.cpp:100 +#: gerbview/tool_gerber.cpp:285 msgid "redraw" msgstr "Redessin" #: pcbnew/tool_modedit.cpp:119 #: pcbnew/tool_pcb.cpp:268 +#: eeschema/tool_lib.cpp:181 +#: eeschema/tool_sch.cpp:105 +#: gerbview/tool_gerber.cpp:296 +#: 3d-viewer/3d_toolbar.cpp:52 msgid "auto zoom" msgstr "Zoom automatique" @@ -3656,31 +4098,44 @@ msgstr "Addition de graphiques (Arc de Cercle)" #: pcbnew/tool_modedit.cpp:181 #: pcbnew/tool_pcb.cpp:455 +#: eeschema/menubar.cpp:146 +#: eeschema/tool_lib.cpp:90 +#: eeschema/tool_sch.cpp:228 +#: gerbview/tool_gerber.cpp:393 msgid "Delete items" msgstr "Suppression d'éléments" #: pcbnew/tool_modedit.cpp:203 #: pcbnew/tool_pcb.cpp:328 +#: eeschema/tool_sch.cpp:250 +#: gerbview/tool_gerber.cpp:417 msgid "Display Grid OFF" msgstr "Suppression de l'affichage de la grille" #: pcbnew/tool_modedit.cpp:207 #: pcbnew/tool_pcb.cpp:331 +#: gerbview/tool_gerber.cpp:423 msgid "Display Polar Coord ON" msgstr "Activer affichage coord Polaires" #: pcbnew/tool_modedit.cpp:211 #: pcbnew/tool_pcb.cpp:333 +#: eeschema/tool_sch.cpp:254 +#: gerbview/tool_gerber.cpp:427 msgid "Units = Inch" msgstr "Unités = pouce" #: pcbnew/tool_modedit.cpp:215 #: pcbnew/tool_pcb.cpp:335 +#: eeschema/tool_sch.cpp:258 +#: gerbview/tool_gerber.cpp:431 msgid "Units = mm" msgstr "Unités = mm" #: pcbnew/tool_modedit.cpp:221 #: pcbnew/tool_pcb.cpp:338 +#: eeschema/tool_sch.cpp:262 +#: gerbview/tool_gerber.cpp:437 msgid "Change Cursor Shape" msgstr "Sélection de la forme du curseur" @@ -3699,6 +4154,8 @@ msgstr "Afficher Modules en contour" #: pcbnew/tool_modedit.cpp:276 #: pcbnew/tool_pcb.cpp:577 +#: eeschema/plotps.cpp:189 +#: share/zoom.cpp:368 msgid "Auto" msgstr "Auto" @@ -3743,6 +4200,8 @@ msgid "Save Board" msgstr "Sauver Circuit Imprimé" #: pcbnew/tool_pcb.cpp:231 +#: eeschema/tool_sch.cpp:49 +#: gerbview/tool_gerber.cpp:232 msgid "page settings (size, texts)" msgstr "Ajustage de la feuille de dessin (dimensions, textes)" @@ -3751,18 +4210,25 @@ msgid "Open Module Editor" msgstr "Ouvrir Editeur de modules" #: pcbnew/tool_pcb.cpp:238 +#: eeschema/tool_sch.cpp:65 +#: gerbview/tool_gerber.cpp:243 msgid "Cut selected item" msgstr "Suppression des éléments sélectionnés" #: pcbnew/tool_pcb.cpp:242 +#: eeschema/tool_sch.cpp:68 +#: gerbview/tool_gerber.cpp:248 msgid "Copy selected item" msgstr "Copie des éléments sélectionnés" #: pcbnew/tool_pcb.cpp:244 +#: eeschema/tool_sch.cpp:71 +#: gerbview/tool_gerber.cpp:254 msgid "Paste" msgstr "Copie des éléments sauvegardés" #: pcbnew/tool_pcb.cpp:247 +#: gerbview/tool_gerber.cpp:261 msgid "Undelete" msgstr "Annulation du dernier effacement" @@ -3775,6 +4241,8 @@ msgid "Plot (HPGL, PostScript, or GERBER format)" msgstr "Tracer en format HPGL, POSTSCRIPT ou GERBER" #: pcbnew/tool_pcb.cpp:272 +#: eeschema/menubar.cpp:154 +#: eeschema/tool_sch.cpp:109 msgid "Find components and texts" msgstr "Recherche de composants et textes" @@ -3815,6 +4283,8 @@ msgid "Enable Auto Del Track" msgstr "Autoriser l'effacement automatique des pistes" #: pcbnew/tool_pcb.cpp:355 +#: pcbnew/pcbframe.cpp:434 +#: pcbnew/set_color.h:423 msgid "Show Zones" msgstr "Monter Zones" @@ -3823,6 +4293,7 @@ msgid "Show Tracks Sketch" msgstr "Afficher Pistes en Contour" #: pcbnew/tool_pcb.cpp:368 +#: pcbnew/pcbframe.cpp:455 msgid "Hight Contrast Mode Display" msgstr "Mode d'affichage Haut Contraste" @@ -3863,6 +4334,7 @@ msgid "Add dimension" msgstr "Ajout des cotes" #: pcbnew/tool_pcb.cpp:450 +#: gerbview/tool_gerber.cpp:378 msgid "Add layer alignment target" msgstr "Ajouter Mire de superposition" @@ -3903,6 +4375,10 @@ msgid "Zoom " msgstr "Zoom " #: pcbnew/tool_pcb.cpp:595 +#: eeschema/eelayer.cpp:223 +#: pcbnew/set_color.h:414 +#: eeschema/eelayer.h:214 +#: gerbview/set_color.h:324 msgid "Grid" msgstr "Grille" @@ -4058,6 +4534,7 @@ msgid "Move Drawing" msgstr "Déplace Tracé" #: pcbnew/onrightclick.cpp:238 +#: eeschema/onrightclick.cpp:208 msgid "End Drawing" msgstr "Fin tracé" @@ -4066,6 +4543,7 @@ msgid "Edit Drawing" msgstr "Edit Tracé" #: pcbnew/onrightclick.cpp:243 +#: eeschema/onrightclick.cpp:210 msgid "Delete Drawing" msgstr "Supprimer Tracé" @@ -4082,6 +4560,7 @@ msgid "Delete Last Corner" msgstr "Supprimer Dernier Sommet" #: pcbnew/onrightclick.cpp:275 +#: eeschema/onrightclick.cpp:155 msgid "Delete Marker" msgstr "Effacer Marqueur" @@ -4422,6 +4901,7 @@ msgid "Rotate +" msgstr "Rotation +" #: pcbnew/onrightclick.cpp:719 +#: eeschema/onrightclick.cpp:288 msgid "Rotate -" msgstr "Rotation -" @@ -4506,10 +4986,12 @@ msgid "90" msgstr "90" #: pcbnew/dialog_pad_edit.cpp:188 +#: eeschema/dialog_edit_component_in_schematic.cpp:175 msgid "-90" msgstr "-90" #: pcbnew/dialog_pad_edit.cpp:189 +#: eeschema/dialog_edit_component_in_schematic.cpp:174 msgid "180" msgstr "180" @@ -4530,6 +5012,7 @@ msgid "SMD" msgstr "CMS" #: pcbnew/dialog_pad_edit.cpp:207 +#: eeschema/netlist.cpp:245 msgid "Conn" msgstr "Conn" @@ -4678,6 +5161,8 @@ msgstr "Choisir l'origine des coordonnées: absolue ou relative à l'axe auxilia #: pcbnew/dialog_gendrill.cpp:205 #: pcbnew/dialog_gendrill.cpp:215 +#: eeschema/libedit.cpp:41 +#: eeschema/viewlibs.cpp:120 msgid "None" msgstr "Aucun" @@ -4718,6 +5203,7 @@ msgid "Speed (cm/s)" msgstr "Vitesse plume ( cm/s )" #: pcbnew/dialog_gendrill.cpp:233 +#: eeschema/plothpgl.cpp:256 msgid "Pen Number" msgstr "Numéro de plume" @@ -4774,6 +5260,9 @@ msgid "Board modified, Save before exit ?" msgstr "Circuit Imprimé modifiée, Sauver avant de quitter ?" #: pcbnew/pcbframe.cpp:281 +#: eeschema/schframe.cpp:310 +#: cvpcb/cvframe.cpp:178 +#: common/confirm.cpp:119 msgid "Confirmation" msgstr "Confirmation" @@ -4794,10 +5283,12 @@ msgid "Display Polar Coords" msgstr "Affichage coord Polaires" #: pcbnew/pcbframe.cpp:402 +#: eeschema/schframe.cpp:410 msgid "Grid not show" msgstr "Grille non montrée" #: pcbnew/pcbframe.cpp:402 +#: eeschema/schframe.cpp:410 msgid "Show Grid" msgstr "Afficher grille" @@ -4850,6 +5341,7 @@ msgid "Normal Contrast Mode Display" msgstr "Mode d'affichage Contraste normal" #: eeschema/affiche.cpp:22 +#: eeschema/dialog_create_component.cpp:160 msgid "Name" msgstr "Nom" @@ -4858,6 +5350,7 @@ msgid "FileName" msgstr "Nom Fichier" #: eeschema/affiche.cpp:37 +#: eeschema/component_class.cpp:72 msgid "Ref" msgstr "Ref" @@ -4882,6 +5375,7 @@ msgid "PinName" msgstr "Nom Pin" #: eeschema/affiche.cpp:79 +#: eeschema/eelayer.h:140 msgid "PinNum" msgstr "Num Pin" @@ -4904,31 +5398,44 @@ msgid "Lengh" msgstr "Long." #: eeschema/affiche.cpp:101 +#: eeschema/dialog_edit_label.cpp:150 +#: eeschema/pinedit-dialog.cpp:225 msgid "Up" msgstr "Haut" #: eeschema/affiche.cpp:104 +#: eeschema/dialog_edit_label.cpp:152 +#: eeschema/pinedit-dialog.cpp:226 msgid "Down" msgstr "Bas" #: eeschema/affiche.cpp:107 +#: eeschema/dialog_edit_label.cpp:151 +#: eeschema/pinedit-dialog.cpp:224 msgid "Left" msgstr "Gauche" #: eeschema/affiche.cpp:110 +#: eeschema/dialog_edit_label.cpp:149 +#: eeschema/pinedit-dialog.cpp:223 msgid "Right" msgstr "Droite" #: eeschema/affiche.cpp:168 #: eeschema/affiche.cpp:174 +#: share/svg_print.cpp:229 +#: share/dialog_print.cpp:218 msgid "All" msgstr "Tout" #: eeschema/affiche.cpp:171 +#: eeschema/onrightclick.cpp:328 msgid "Unit" msgstr "Unité" #: eeschema/affiche.cpp:181 +#: eeschema/dialog_edit_component_in_schematic.cpp:191 +#: eeschema/onrightclick.cpp:315 msgid "Convert" msgstr "Convert" @@ -5120,6 +5627,14 @@ msgstr "" "#End List\n" #: eeschema/build_BOM.cpp:691 +#: eeschema/component_class.cpp:76 +#: eeschema/component_class.cpp:77 +#: eeschema/component_class.cpp:78 +#: eeschema/component_class.cpp:79 +#: eeschema/component_class.cpp:80 +#: eeschema/component_class.cpp:81 +#: eeschema/component_class.cpp:82 +#: eeschema/component_class.cpp:83 msgid "Field" msgstr "Champ" @@ -5195,6 +5710,8 @@ msgid "%8.8lX/" msgstr "%8.8lX/" #: eeschema/component_class.cpp:75 +#: eeschema/eeredraw.cpp:130 +#: eeschema/eelayer.h:171 msgid "Sheet" msgstr "Feuille" @@ -5241,6 +5758,7 @@ msgid "Hierachy Pins by Sheets" msgstr "Pins de hiérarchie par feuilles" #: eeschema/dialog_build_BOM.cpp:269 +#: eeschema/netlist.cpp:197 msgid "List" msgstr "Liste" @@ -5313,6 +5831,7 @@ msgid "Create &List" msgstr "Créer &Liste" #: eeschema/dialog_build_BOM.cpp:352 +#: cvpcb/dialog_display_options.cpp:196 msgid "&Apply" msgstr "&Appliquer" @@ -5321,10 +5840,14 @@ msgid "Options :" msgstr "Options :" #: eeschema/dialog_cmp_graphic_properties.cpp:156 +#: eeschema/symbtext.cpp:162 +#: eeschema/pinedit-dialog.cpp:193 msgid "Common to Units" msgstr "Commun aux Unités" #: eeschema/dialog_cmp_graphic_properties.cpp:160 +#: eeschema/symbtext.cpp:166 +#: eeschema/pinedit-dialog.cpp:197 msgid "Common to convert" msgstr "Commun a converti" @@ -5341,14 +5864,18 @@ msgid "Fill:" msgstr "Remplissage:" #: eeschema/dialog_create_component.cpp:183 +#: eeschema/edit_component_in_lib.cpp:401 msgid "As Convert" msgstr "A une forme \"convertie\"" #: eeschema/dialog_create_component.cpp:187 +#: eeschema/dialog_edit_component_in_lib.cpp:161 msgid "Power Symbol" msgstr "Symbole Alimentation" #: eeschema/dialog_create_component.cpp:191 +#: eeschema/dialog_edit_component_in_lib.cpp:165 +#: eeschema/dialog_edit_component_in_schematic.cpp:188 msgid "Parts are locked" msgstr "Les parts sont verrouillées" @@ -5469,14 +5996,17 @@ msgid "Show Pin Number" msgstr "Montrer Numéro de Pin" #: eeschema/dialog_create_component.cpp:254 +#: eeschema/edit_component_in_lib.cpp:418 msgid "Show Pin Name" msgstr "Montre Nom de Pin" #: eeschema/dialog_create_component.cpp:258 +#: eeschema/edit_component_in_lib.cpp:429 msgid "Pin Name Inside" msgstr "Nom de pin a l'intérieur" #: eeschema/dialog_create_component.cpp:262 +#: eeschema/dialog_edit_component_in_lib.cpp:155 msgid "Skew:" msgstr "Décalage:" @@ -5639,6 +6169,7 @@ msgid "Orient:" msgstr "Orient:" #: eeschema/dialog_edit_component_in_schematic.cpp:182 +#: eeschema/onrightclick.cpp:289 msgid "Mirror --" msgstr "Miroir--" @@ -5661,11 +6192,13 @@ msgstr "Texte visible" #: eeschema/dialog_edit_component_in_schematic.cpp:216 #: eeschema/edit_component_in_lib.cpp:502 +#: eeschema/symbtext.cpp:170 msgid "Vertical" msgstr "Vertical" #: eeschema/dialog_edit_component_in_schematic.cpp:226 #: eeschema/edit_component_in_lib.cpp:484 +#: eeschema/eelayer.h:164 msgid "Fields" msgstr "Champs" @@ -5698,14 +6231,19 @@ msgid "Text Orient:" msgstr "Orient:" #: eeschema/dialog_edit_label.cpp:160 +#: eeschema/pinedit-dialog.cpp:264 +#: eeschema/component_wizard/ki_component_setup.cpp:219 msgid "Input" msgstr "Entrée" #: eeschema/dialog_edit_label.cpp:161 +#: eeschema/pinedit-dialog.cpp:265 +#: eeschema/component_wizard/ki_component_setup.cpp:220 msgid "Output" msgstr "Sortie" #: eeschema/dialog_edit_label.cpp:162 +#: eeschema/pinedit-dialog.cpp:266 msgid "Bidi" msgstr "Bidi" @@ -5714,6 +6252,8 @@ msgid "TriState" msgstr "3 états" #: eeschema/dialog_edit_label.cpp:164 +#: eeschema/pinedit-dialog.cpp:268 +#: eeschema/component_wizard/ki_component_setup.cpp:223 msgid "Passive" msgstr "Passive" @@ -5936,6 +6476,7 @@ msgid "Delta Label:" msgstr "Incrément Label:" #: eeschema/dialog_options.cpp:326 +#: eeschema/plotps.cpp:248 msgid "Default Line Width" msgstr "Epaiss. ligne par défaut" @@ -5944,6 +6485,7 @@ msgid "Default Label Size" msgstr "Taille Label par défaut:" #: eeschema/edit_component_in_lib.cpp:168 +#: eeschema/dialog_edit_component_in_lib.h:56 msgid "Lib Component Properties" msgstr "Propriétés du composant librairie" @@ -5978,6 +6520,7 @@ msgstr "Justifié à gauche" #: eeschema/edit_component_in_lib.cpp:476 #: eeschema/edit_component_in_lib.cpp:478 +#: share/zoom.cpp:360 msgid "Center" msgstr "Centrer" @@ -6063,6 +6606,7 @@ msgid "Delete Convert items" msgstr "Suppression des éléments convertis" #: eeschema/edit_component_in_lib.cpp:1144 +#: common/eda_doc.cpp:134 msgid "Doc Files" msgstr "Fichiers de Doc" @@ -6112,6 +6656,9 @@ msgid "Empty Text!" msgstr "Texte vide" #: eeschema/eeconfig.cpp:73 +#: kicad/files-io.cpp:131 +#: gerbview/dcode.cpp:266 +#: gerbview/readgerb.cpp:145 msgid "File " msgstr "Fichier " @@ -6124,6 +6671,7 @@ msgid "White" msgstr "Blanc" #: eeschema/eelayer.cpp:234 +#: share/dialog_print.cpp:204 msgid "Black" msgstr "Noir" @@ -6193,10 +6741,12 @@ msgid "Warning More than 1 Pin connected to UnConnect symbol" msgstr "Warning: plus que 1 Pin connectée a un symbole de non connexion" #: eeschema/erc.cpp:595 +#: common/confirm.cpp:84 msgid "Warning" msgstr "Avertissement" #: eeschema/erc.cpp:598 +#: common/confirm.cpp:88 msgid "Error" msgstr "Erreur" @@ -6245,6 +6795,7 @@ msgid "Clear Schematic Hierarchy (modified!)?" msgstr "Effacer la hiérarchie schématique (modifiée!)?" #: eeschema/files-io.cpp:82 +#: eeschema/save_schemas.cpp:61 msgid "Schematic files:" msgstr "Fichiers schématiques:" @@ -6296,6 +6847,7 @@ msgid " Not Found" msgstr " Non trouvé" #: eeschema/find.cpp:653 +#: eeschema/selpart.cpp:39 msgid "No libraries are loaded" msgstr "Pas de librairies chargées" @@ -6349,10 +6901,12 @@ msgid "Root" msgstr "Racine" #: eeschema/hotkeys.cpp:249 +#: eeschema/schedit.cpp:241 msgid "Add Component" msgstr "Ajout Composant" #: eeschema/hotkeys.cpp:271 +#: eeschema/schedit.cpp:189 msgid "Add Wire" msgstr "Ajouter Fils" @@ -6510,6 +7064,7 @@ msgid "Move Text " msgstr "Déplacer Texte" #: eeschema/libedit_onrightclick.cpp:126 +#: eeschema/dialog_edit_label.h:44 msgid "Text Editor" msgstr "Editeur de Texte" @@ -6724,6 +7279,7 @@ msgid "Done Loading " msgstr "Chargement terminé" #: eeschema/menubar.cpp:41 +#: gerbview/tool_gerber.cpp:63 msgid "&New" msgstr "&Nouveau" @@ -6732,6 +7288,7 @@ msgid "New schematic" msgstr "Nouvelle schématique" #: eeschema/menubar.cpp:47 +#: cvpcb/tool_cvpcb.cpp:109 msgid "&Open" msgstr "&Ouvrir " @@ -6744,6 +7301,7 @@ msgid "&Save" msgstr "&Sauver" #: eeschema/menubar.cpp:55 +#: eeschema/tool_sch.cpp:45 msgid "Save schematic project" msgstr "Sauver le Projet schématique" @@ -6812,6 +7370,7 @@ msgid "&Redo\t" msgstr "&Redo\t" #: eeschema/menubar.cpp:154 +#: pcbnew/find.h:38 msgid "Find" msgstr "Chercher" @@ -6825,11 +7384,13 @@ msgstr "Rétroannotation des Champs Modules" #: eeschema/menubar.cpp:169 #: eeschema/menubar.cpp:172 +#: share/zoom.cpp:361 msgid "Zoom in" msgstr "Zoom +" #: eeschema/menubar.cpp:177 #: eeschema/menubar.cpp:180 +#: share/zoom.cpp:362 msgid "Zoom out" msgstr "Zoom -" @@ -6843,6 +7404,7 @@ msgid "&Component" msgstr "&Composant" #: eeschema/menubar.cpp:206 +#: eeschema/tool_sch.cpp:156 msgid "Place the component" msgstr "Placer le Composant" @@ -6851,6 +7413,7 @@ msgid "&Power port" msgstr "Power Symbole" #: eeschema/menubar.cpp:212 +#: eeschema/tool_sch.cpp:160 msgid "Place the power port" msgstr "Placer le Symbole Power" @@ -6859,6 +7422,7 @@ msgid "&Wire" msgstr "&Fil" #: eeschema/menubar.cpp:218 +#: eeschema/tool_sch.cpp:165 msgid "Place the wire" msgstr "Place fil" @@ -6911,6 +7475,7 @@ msgid "Place a global label. Warning: all global labels with the same name are c msgstr "Placer un label global. Attention: tous les labels globaux avec le même nom sont connectés dans toute la hierarchie" #: eeschema/menubar.cpp:284 +#: eeschema/eelayer.h:85 msgid "Junction" msgstr "Jonction" @@ -6963,6 +7528,7 @@ msgid "Graphic text (comment)" msgstr "Ttextes graphiques (commentaires)" #: eeschema/menubar.cpp:349 +#: eeschema/tool_sch.cpp:223 msgid "Place the graphic text (comment)" msgstr "Placer le textes graphique (commentaire)" @@ -6971,6 +7537,7 @@ msgid "Setting colors..." msgstr "Choisir les couleurs d'affichage..." #: eeschema/menubar.cpp:371 +#: gerbview/tool_gerber.cpp:110 msgid "&Options" msgstr "&Options" @@ -7093,6 +7660,7 @@ msgstr "Trace " #: eeschema/netlist_control.cpp:124 #: eeschema/netlist_control.cpp:240 +#: gerbview/options.cpp:201 msgid "Default format" msgstr "Format par défaut" @@ -7146,6 +7714,7 @@ msgid "Netlist command:" msgstr "Commande netliste:" #: eeschema/netlist_control.cpp:320 +#: share/setpage.cpp:354 msgid "Title:" msgstr "Titre:" @@ -7465,30 +8034,37 @@ msgid "Copy to Clipboard" msgstr "Copie dans Presse papier" #: eeschema/pinedit.cpp:22 +#: eeschema/pinedit-dialog.cpp:251 msgid "line" msgstr "Ligne" #: eeschema/pinedit.cpp:22 +#: eeschema/pinedit-dialog.cpp:252 msgid "invert" msgstr "invert" #: eeschema/pinedit.cpp:22 +#: eeschema/pinedit-dialog.cpp:253 msgid "clock" msgstr "clock" #: eeschema/pinedit.cpp:22 +#: eeschema/pinedit-dialog.cpp:254 msgid "clock inv" msgstr "clock inv" #: eeschema/pinedit.cpp:23 +#: eeschema/pinedit-dialog.cpp:255 msgid "low in" msgstr "low in" #: eeschema/pinedit.cpp:23 +#: eeschema/pinedit-dialog.cpp:256 msgid "low clock" msgstr "low clock" #: eeschema/pinedit.cpp:23 +#: eeschema/pinedit-dialog.cpp:257 msgid "low out" msgstr "low out" @@ -7523,6 +8099,8 @@ msgid "B/W" msgstr "N/B" #: eeschema/plotps.cpp:204 +#: share/svg_print.cpp:212 +#: share/dialog_print.cpp:203 msgid "Color" msgstr "Couleur" @@ -7531,6 +8109,8 @@ msgid "Plot Color:" msgstr "Tracé et Couleurs:" #: eeschema/plotps.cpp:209 +#: share/svg_print.cpp:218 +#: share/dialog_print.cpp:194 msgid "Print Sheet Ref" msgstr "Imprimer cartouche" @@ -7544,6 +8124,8 @@ msgid "Plot: %s\n" msgstr "Trace: %s\n" #: eeschema/save_schemas.cpp:86 +#: eeschema/netform.cpp:60 +#: eeschema/netform.cpp:278 msgid "Failed to create file " msgstr "Impossible de créer le fichier " @@ -7605,6 +8187,7 @@ msgid "Select component (%d items)" msgstr "Selection composant (%d items)" #: eeschema/sheet.cpp:162 +#: share/svg_print.cpp:243 msgid "Filename:" msgstr "Nom Fichier:" @@ -7915,18 +8498,26 @@ msgid "Display next part" msgstr "Afficher composant suivant" #: eeschema/tool_viewlib.cpp:67 +#: cvpcb/displayframe.cpp:123 +#: 3d-viewer/3d_toolbar.cpp:43 msgid "zoom + (F1)" msgstr "zoom + (F1)" #: eeschema/tool_viewlib.cpp:71 +#: cvpcb/displayframe.cpp:126 +#: 3d-viewer/3d_toolbar.cpp:46 msgid "zoom - (F2)" msgstr "zoom - (F2)" #: eeschema/tool_viewlib.cpp:75 +#: cvpcb/displayframe.cpp:129 +#: 3d-viewer/3d_toolbar.cpp:49 msgid "redraw (F3)" msgstr "Redessin (F3)" #: eeschema/tool_viewlib.cpp:79 +#: cvpcb/displayframe.cpp:132 +#: cvpcb/displayframe.cpp:136 msgid "1:1 zoom" msgstr "1:1 zoom" @@ -8002,6 +8593,7 @@ msgid "3 States" msgstr "3 Etats" #: eeschema/pinedit-dialog.cpp:269 +#: eeschema/component_wizard/ki_component_setup.cpp:224 msgid "Unspecified" msgstr "Non specifié" @@ -8186,10 +8778,13 @@ msgid "Cvpcb is already running, Continue?" msgstr "Cvpcb est est cours d'exécution. Continuer ?" #: cvpcb/displayframe.cpp:118 +#: pcbnew/dialog_display_options.h:54 +#: cvpcb/dialog_display_options.h:51 msgid "Display Options" msgstr "Options d'Affichage" #: cvpcb/genorcad.cpp:134 +#: cvpcb/writenetlistpcbnew.cpp:168 #, c-format msgid "%s %s pin %s : Different Nets" msgstr "%s %s pin %s : Nets Differents" @@ -8200,6 +8795,7 @@ msgid "Components: %d (free: %d)" msgstr "Composants: %d (libres: %d)" #: cvpcb/init.cpp:112 +#: cvpcb/cvframe.cpp:340 #, c-format msgid "Componants: %d (free: %d)" msgstr "Composants: %d (libres: %d)" @@ -8441,6 +9037,7 @@ msgid "Delete selections" msgstr "Effacement des associations existantes" #: cvpcb/cvframe.cpp:424 +#: share/drawframe.cpp:134 msgid "font for dialog boxes" msgstr "fonte pour boites de dialogue" @@ -8449,14 +9046,17 @@ msgid "font for Lists" msgstr "fonte pour listes" #: cvpcb/cvframe.cpp:428 +#: share/drawframe.cpp:138 msgid "font for Status Line" msgstr "fonte pour Ligne d'état" #: cvpcb/cvframe.cpp:431 +#: share/drawframe.cpp:141 msgid "&Font selection" msgstr "Sélection Fonte" #: cvpcb/cvframe.cpp:433 +#: share/drawframe.cpp:142 msgid "Choose font type and size for dialogs, infos and status box" msgstr "Choisir les fontes et leur taille pour les dialogues, infos et ligne d'état" @@ -8660,6 +9260,7 @@ msgid "You must choose a PDF viewer before use this option" msgstr "Vous devez choisir un Visualisateur PDF avant d'utiliser cette option" #: kicad/preferences.cpp:97 +#: common/gestfich.cpp:685 msgid "Prefered Editor:" msgstr "Editeur préféré:" @@ -8868,6 +9469,7 @@ msgid "Load file:" msgstr "Charger Fichiers:" #: gerbview/affiche.cpp:34 +#: gerbview/tool_gerber.cpp:310 msgid "Layer " msgstr "Couche " @@ -8921,6 +9523,7 @@ msgid "Gerber files:" msgstr "Fichiers Gerber:" #: gerbview/files.cpp:187 +#: gerbview/readgerb.cpp:273 msgid "D codes files:" msgstr "Fichiers D-Codes:" @@ -8929,6 +9532,7 @@ msgid "GerbView is already running. Continue?" msgstr "Gerbview est est cours d'exécution. Continuer ?" #: gerbview/gerbview_config.cpp:131 +#: gerbview/process_config.cpp:117 msgid "Save config file" msgstr "Sauver config" @@ -9732,86 +10336,6 @@ msgstr "Couche ECO1 On/Off" msgid "Eco2 Layer On/Off" msgstr "Couche ECO2 On/Off" -#: share/dialog_print.cpp:137 -msgid "fit in page" -msgstr "Ajustage en page" - -#: share/dialog_print.cpp:138 -msgid "Scale 0.5" -msgstr "Echelle 0,5" - -#: share/dialog_print.cpp:139 -msgid "Scale 0.7" -msgstr "Echelle 0,7" - -#: share/dialog_print.cpp:140 -msgid "Approx. Scale 1" -msgstr "Echelle Appprox. 1" - -#: share/dialog_print.cpp:141 -msgid "Accurate Scale 1" -msgstr "Echelle Précise 1" - -#: share/dialog_print.cpp:142 -msgid "Scale 1.4" -msgstr "Echelle 1,4" - -#: share/dialog_print.cpp:145 -msgid "Scale 4" -msgstr "Echelle 4" - -#: share/dialog_print.cpp:146 -msgid "Approx. Scale:" -msgstr "Echelle approx.:" - -#: share/dialog_print.cpp:150 -msgid "X Scale Adjust" -msgstr "Ajustage Echelle X" - -#: share/dialog_print.cpp:156 -msgid "Y Scale Adjust" -msgstr "Ajustage Echelle Y" - -#: share/dialog_print.cpp:185 -msgid "Color Print:" -msgstr "Impression Couleurs:" - -#: share/dialog_print.cpp:190 -msgid "1 Page per Layer" -msgstr "1 Page par couche" - -#: share/dialog_print.cpp:191 -msgid "Single Page" -msgstr "Page unique" - -#: share/dialog_print.cpp:192 -#: share/dialog_print.cpp:199 -#: share/svg_print.cpp:230 -msgid "Page Print:" -msgstr "Imprimer page" - -#: share/dialog_print.cpp:197 -#: share/svg_print.cpp:228 -msgid "Current" -msgstr "Courant" - -#: share/dialog_print.cpp:210 -msgid "Print S&etup" -msgstr "Options Impr&ession" - -#: share/dialog_print.cpp:214 -msgid "Pre&view" -msgstr "Pre&visualisation" - -#: share/dialog_print.cpp:218 -msgid "&Print" -msgstr "Imp&rimer" - -#: share/dialog_print.cpp:235 -#: share/svg_print.cpp:262 -msgid "Pen width mini" -msgstr "Epaiss plume mini" - #: share/drawframe.cpp:136 msgid "font for info display" msgstr "fonte pour affichage infos" @@ -9924,27 +10448,6 @@ msgstr "Commentaire3:" msgid "Comment4:" msgstr "Commentaire4:" -#: share/wxprint.cpp:164 -msgid "Error Init Printer info" -msgstr "Erreur Init info imprimante" - -#: share/wxprint.cpp:408 -msgid "Printer Problem!" -msgstr "Probleme d'imprimante" - -#: share/wxprint.cpp:441 -msgid "There was a problem previewing" -msgstr "Il y a un problème de prévisualisation" - -#: share/wxprint.cpp:505 -msgid "There was a problem printing" -msgstr "Il y a un problème d'impression" - -#: share/wxprint.cpp:521 -#, c-format -msgid "Print page %d" -msgstr "Print page %d" - #: share/zoom.cpp:326 msgid "Zoom: " msgstr "Zoom: " @@ -9977,6 +10480,17 @@ msgstr "Noir et Blanc" msgid "Print mode" msgstr "Mode d'impression" +#: share/svg_print.cpp:228 +#: share/dialog_print.cpp:217 +msgid "Current" +msgstr "Courant" + +#: share/svg_print.cpp:230 +#: share/dialog_print.cpp:212 +#: share/dialog_print.cpp:219 +msgid "Page Print:" +msgstr "Imprimer page" + #: share/svg_print.cpp:234 msgid "Create &File" msgstr "Créer &Fichier" @@ -9985,6 +10499,11 @@ msgstr "Créer &Fichier" msgid "Messages:" msgstr "Messages:" +#: share/svg_print.cpp:262 +#: share/dialog_print.cpp:256 +msgid "Pen width mini" +msgstr "Epaiss plume mini" + #: share/svg_print.cpp:392 #: share/svg_print.cpp:409 msgid "Create file " @@ -9995,6 +10514,95 @@ msgstr "Créer Fichier " msgid " error" msgstr " erreur" +#: share/wxprint.cpp:163 +msgid "Error Init Printer info" +msgstr "Erreur Init info imprimante" + +#: share/wxprint.cpp:413 +msgid "Printer Problem!" +msgstr "Probleme d'imprimante" + +#: share/wxprint.cpp:446 +msgid "There was a problem previewing" +msgstr "Il y a un problème de prévisualisation" + +#: share/wxprint.cpp:510 +msgid "There was a problem printing" +msgstr "Il y a un problème d'impression" + +#: share/wxprint.cpp:526 +#, c-format +msgid "Print page %d" +msgstr "Print page %d" + +#: share/dialog_print.cpp:146 +msgid "Exclude Edges_Pcb Layer" +msgstr "Exclure Couche Contours PCB" + +#: share/dialog_print.cpp:157 +msgid "fit in page" +msgstr "Ajustage en page" + +#: share/dialog_print.cpp:158 +msgid "Scale 0.5" +msgstr "Echelle 0,5" + +#: share/dialog_print.cpp:159 +msgid "Scale 0.7" +msgstr "Echelle 0,7" + +#: share/dialog_print.cpp:160 +msgid "Approx. Scale 1" +msgstr "Echelle Appprox. 1" + +#: share/dialog_print.cpp:161 +msgid "Accurate Scale 1" +msgstr "Echelle Précise 1" + +#: share/dialog_print.cpp:162 +msgid "Scale 1.4" +msgstr "Echelle 1,4" + +#: share/dialog_print.cpp:165 +msgid "Scale 4" +msgstr "Echelle 4" + +#: share/dialog_print.cpp:166 +msgid "Approx. Scale:" +msgstr "Echelle approx.:" + +#: share/dialog_print.cpp:170 +msgid "X Scale Adjust" +msgstr "Ajustage Echelle X" + +#: share/dialog_print.cpp:176 +msgid "Y Scale Adjust" +msgstr "Ajustage Echelle Y" + +#: share/dialog_print.cpp:205 +msgid "Color Print:" +msgstr "Impression Couleurs:" + +#: share/dialog_print.cpp:210 +msgid "1 Page per Layer" +msgstr "1 Page par couche" + +#: share/dialog_print.cpp:211 +msgid "Single Page" +msgstr "Page unique" + +#: share/dialog_print.cpp:230 +msgid "Print S&etup" +msgstr "Options Impr&ession" + +#: share/dialog_print.cpp:234 +msgid "Pre&view" +msgstr "Pre&visualisation" + +#: share/dialog_print.cpp:238 +msgid "&Print" +msgstr "Imp&rimer" + #: pcbnew/cleaningoptions_dialog.h:48 msgid "Cleaning options" msgstr "Options de Nettoyage" @@ -10012,6 +10620,7 @@ msgid "dialog_freeroute_exchange" msgstr "dialog_freeroute_exchange" #: pcbnew/dialog_general_options.h:60 +#: eeschema/dialog_options.h:55 msgid "General Options" msgstr "Options Générales" @@ -10028,6 +10637,7 @@ msgid "Footprints Orientation" msgstr "Orientation des Modules" #: pcbnew/dialog_setup_libs.h:43 +#: eeschema/dialog_eeschema_config.h:50 msgid "Dialog" msgstr "Dialog" @@ -10434,10 +11044,6 @@ msgstr "Autres" msgid "D codes id." msgstr "DCodes id." -#: share/dialog_print.h:51 -msgid "Print" -msgstr "Imprimer" - #: share/setpage.h:84 msgid "Page Settings" msgstr "Ajustage opt Page" @@ -10446,40 +11052,7 @@ msgstr "Ajustage opt Page" msgid "Create SVG file" msgstr "Créer Fichier SVG" -#~ msgid " Unicode " -#~ msgstr " Unicode " -#~ msgid " Ansi " -#~ msgstr " Ansi " -#~ msgid "64 bits" -#~ msgstr "64 bits" -#~ msgid "32 bits" -#~ msgstr "32 bits" -#~ msgid "" -#~ "\n" -#~ "Dutch (NL) Jerry Jacobs " -#~ msgstr "" -#~ "\n" -#~ "Dutch (NL) Jerry Jacobs " -#~ msgid "" -#~ "\n" -#~ "French (FR) Jean-Pierre Charras " -#~ msgstr "" -#~ "\n" -#~ "French (FR) Jean-Pierre Charras " -#~ msgid "" -#~ "\n" -#~ "Portuguese (PT) Renie Marquet " -#~ msgstr "" -#~ "\n" -#~ "Portuguese (PT) Renie Marquet " -#~ msgid "" -#~ "\n" -#~ "Russian (RU) Igor Plyatov " -#~ msgstr "" -#~ "\n" -#~ "Russian (RU) Igor Plyatov " -#~ msgid "Move Feild " -#~ msgstr "Déplace Champ" -#~ msgid "&Plot CURRENT" -#~ msgstr "&Tracer courant" +#: share/dialog_print.h:52 +msgid "Print" +msgstr "Imprimer" diff --git a/share/dialog_print.cpp b/share/dialog_print.cpp index 1e04e9d88a..94f2aaf591 100644 --- a/share/dialog_print.cpp +++ b/share/dialog_print.cpp @@ -78,20 +78,26 @@ WinEDA_PrintFrame::WinEDA_PrintFrame( WinEDA_DrawFrame* parent, wxWindowID id, c bool WinEDA_PrintFrame::Create( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style ) { ////@begin WinEDA_PrintFrame member initialisation + m_FullDialogBowSizer = NULL; + m_LeftBoxSizer = NULL; + m_LayersSelectionsBoxSizer = NULL; m_CopperLayersBoxSizer = NULL; m_TechLayersBoxSizer = NULL; m_Exclude_Edges_Pcb = NULL; + m_ScaleBoxSizer = NULL; m_ScaleOption = NULL; m_FineAdjustXscaleTitle = NULL; m_FineAdjustXscaleOpt = NULL; m_FineAdjustYscaleTitle = NULL; m_FineAdjustYscaleOpt = NULL; + m_OptionsBoxSizer = NULL; m_DialogPenWidthSizer = NULL; m_Print_Sheet_Ref = NULL; m_Print_Mirror = NULL; m_ColorOption = NULL; m_PagesOptionPcb = NULL; m_PagesOptionEeschema = NULL; + m_ButtonsBoxSizer = NULL; m_CloseButton = NULL; ////@end WinEDA_PrintFrame member initialisation @@ -118,36 +124,34 @@ void WinEDA_PrintFrame::CreateControls() SetFont(*g_DialogFont); ////@begin WinEDA_PrintFrame content construction - // Generated by DialogBlocks, 22/03/2008 08:33:38 (unregistered) + // Generated by DialogBlocks, 25/08/2008 12:59:33 (unregistered) WinEDA_PrintFrame* itemDialog1 = this; - wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxHORIZONTAL); - itemDialog1->SetSizer(itemBoxSizer2); + m_FullDialogBowSizer = new wxBoxSizer(wxHORIZONTAL); + itemDialog1->SetSizer(m_FullDialogBowSizer); + + m_LeftBoxSizer = new wxBoxSizer(wxVERTICAL); + m_FullDialogBowSizer->Add(m_LeftBoxSizer, 0, wxGROW|wxTOP|wxBOTTOM, 5); + + m_LayersSelectionsBoxSizer = new wxBoxSizer(wxHORIZONTAL); + m_LeftBoxSizer->Add(m_LayersSelectionsBoxSizer, 0, wxGROW|wxALL, 5); - wxBoxSizer* leftBoxSizer = new wxBoxSizer(wxVERTICAL); - itemBoxSizer2->Add(leftBoxSizer, 0, wxALIGN_TOP|wxALL,5); - - wxBoxSizer* layersBoxSizer = new wxBoxSizer(wxHORIZONTAL); - leftBoxSizer->Add(layersBoxSizer, 0, wxGROW|wxALL,5); - m_CopperLayersBoxSizer = new wxBoxSizer(wxVERTICAL); - layersBoxSizer->Add(m_CopperLayersBoxSizer, 0, wxGROW|wxALL, 5); + m_LayersSelectionsBoxSizer->Add(m_CopperLayersBoxSizer, 0, wxALIGN_TOP|wxRIGHT|wxTOP|wxBOTTOM, 5); m_TechLayersBoxSizer = new wxBoxSizer(wxVERTICAL); - layersBoxSizer->Add(m_TechLayersBoxSizer, 0, wxALIGN_TOP|wxALL, 5); + m_LayersSelectionsBoxSizer->Add(m_TechLayersBoxSizer, 0, wxALIGN_TOP|wxALL, 5); - wxBoxSizer* itemBoxSizer5 = new wxBoxSizer(wxVERTICAL); - itemBoxSizer2->Add(itemBoxSizer5, 0, wxGROW|wxALL, 5); - - // Option for excluding contents of "Edges Pcb" layer - m_Exclude_Edges_Pcb = new wxCheckBox( this, - ID_EXCLUDE_EDGES_PCB, _( "Exclude Edges_Pcb layer" ) ); - - //m_Exclude_Edges_Pcb->SetValue( g_Exclude_Edges_Pcb ); - m_Exclude_Edges_Pcb->SetToolTip( - _( "Exclude contents of Edges_Pcb layer from all other layers" ) ); - leftBoxSizer->Add( m_Exclude_Edges_Pcb, 0, wxGROW | wxALL, 1 ); + m_Exclude_Edges_Pcb = new wxCheckBox( itemDialog1, ID_EXCLUDE_EDGES_PCB, _("Exclude Edges_Pcb Layer"), wxDefaultPosition, wxDefaultSize, 0 ); + m_Exclude_Edges_Pcb->SetValue(false); + if (WinEDA_PrintFrame::ShowToolTips()) + m_Exclude_Edges_Pcb->SetToolTip(_("Exclude contents of Edges_Pcb layer from all other layers")); + m_Exclude_Edges_Pcb->Show(false); + m_LeftBoxSizer->Add(m_Exclude_Edges_Pcb, 0, wxGROW|wxALL, 5); + + m_ScaleBoxSizer = new wxBoxSizer(wxVERTICAL); + m_FullDialogBowSizer->Add(m_ScaleBoxSizer, 0, wxGROW|wxALL, 5); wxArrayString m_ScaleOptionStrings; m_ScaleOptionStrings.Add(_("fit in page")); @@ -161,83 +165,83 @@ void WinEDA_PrintFrame::CreateControls() m_ScaleOptionStrings.Add(_("Scale 4")); m_ScaleOption = new wxRadioBox( itemDialog1, ID_SET_PRINT_SCALE, _("Approx. Scale:"), wxDefaultPosition, wxDefaultSize, m_ScaleOptionStrings, 1, wxRA_SPECIFY_COLS ); m_ScaleOption->SetSelection(0); - itemBoxSizer5->Add(m_ScaleOption, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); + m_ScaleBoxSizer->Add(m_ScaleOption, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); m_FineAdjustXscaleTitle = new wxStaticText( itemDialog1, wxID_STATIC, _("X Scale Adjust"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer5->Add(m_FineAdjustXscaleTitle, 0, wxGROW|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5); + m_ScaleBoxSizer->Add(m_FineAdjustXscaleTitle, 0, wxGROW|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5); m_FineAdjustXscaleOpt = new wxTextCtrl( itemDialog1, ID_TEXTCTRL, _T(""), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer5->Add(m_FineAdjustXscaleOpt, 0, wxGROW|wxLEFT|wxRIGHT|wxBOTTOM, 5); + m_ScaleBoxSizer->Add(m_FineAdjustXscaleOpt, 0, wxGROW|wxLEFT|wxRIGHT|wxBOTTOM, 5); m_FineAdjustYscaleTitle = new wxStaticText( itemDialog1, wxID_STATIC, _("Y Scale Adjust"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer5->Add(m_FineAdjustYscaleTitle, 0, wxGROW|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5); + m_ScaleBoxSizer->Add(m_FineAdjustYscaleTitle, 0, wxGROW|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5); m_FineAdjustYscaleOpt = new wxTextCtrl( itemDialog1, ID_TEXTCTRL1, _T(""), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer5->Add(m_FineAdjustYscaleOpt, 0, wxGROW|wxLEFT|wxRIGHT|wxBOTTOM, 5); + m_ScaleBoxSizer->Add(m_FineAdjustYscaleOpt, 0, wxGROW|wxLEFT|wxRIGHT|wxBOTTOM, 5); - itemBoxSizer2->Add(5, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_FullDialogBowSizer->Add(5, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxBoxSizer* itemBoxSizer12 = new wxBoxSizer(wxVERTICAL); - itemBoxSizer2->Add(itemBoxSizer12, 0, wxGROW|wxALL, 5); + wxBoxSizer* itemBoxSizer15 = new wxBoxSizer(wxVERTICAL); + m_FullDialogBowSizer->Add(itemBoxSizer15, 0, wxGROW|wxALL, 5); - wxStaticBox* itemStaticBoxSizer13Static = new wxStaticBox(itemDialog1, wxID_ANY, _("Options:")); - wxStaticBoxSizer* itemStaticBoxSizer13 = new wxStaticBoxSizer(itemStaticBoxSizer13Static, wxVERTICAL); - itemBoxSizer12->Add(itemStaticBoxSizer13, 0, wxGROW|wxALL, 5); + m_OptionsBoxSizer = new wxStaticBox(itemDialog1, wxID_ANY, _("Options:")); + wxStaticBoxSizer* itemStaticBoxSizer16 = new wxStaticBoxSizer(m_OptionsBoxSizer, wxVERTICAL); + itemBoxSizer15->Add(itemStaticBoxSizer16, 0, wxGROW|wxALL, 5); m_DialogPenWidthSizer = new wxBoxSizer(wxVERTICAL); - itemStaticBoxSizer13->Add(m_DialogPenWidthSizer, 0, wxGROW|wxALL, 5); + itemStaticBoxSizer16->Add(m_DialogPenWidthSizer, 0, wxGROW|wxALL, 5); m_Print_Sheet_Ref = new wxCheckBox( itemDialog1, ID_PRINT_REF, _("Print Sheet Ref"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE ); m_Print_Sheet_Ref->SetValue(false); - itemStaticBoxSizer13->Add(m_Print_Sheet_Ref, 0, wxGROW|wxALL, 5); + itemStaticBoxSizer16->Add(m_Print_Sheet_Ref, 0, wxGROW|wxALL, 5); m_Print_Mirror = new wxCheckBox( itemDialog1, ID_CHECK_PRINT_MIROR, _("Mirror"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE ); m_Print_Mirror->SetValue(false); - itemStaticBoxSizer13->Add(m_Print_Mirror, 0, wxGROW|wxALL, 5); + itemStaticBoxSizer16->Add(m_Print_Mirror, 0, wxGROW|wxALL, 5); wxArrayString m_ColorOptionStrings; m_ColorOptionStrings.Add(_("Color")); m_ColorOptionStrings.Add(_("Black")); m_ColorOption = new wxRadioBox( itemDialog1, ID_SET_BW, _("Color Print:"), wxDefaultPosition, wxDefaultSize, m_ColorOptionStrings, 1, wxRA_SPECIFY_COLS ); m_ColorOption->SetSelection(0); - itemBoxSizer12->Add(m_ColorOption, 0, wxGROW|wxALL, 5); + itemBoxSizer15->Add(m_ColorOption, 0, wxGROW|wxALL, 5); wxArrayString m_PagesOptionPcbStrings; m_PagesOptionPcbStrings.Add(_("1 Page per Layer")); m_PagesOptionPcbStrings.Add(_("Single Page")); m_PagesOptionPcb = new wxRadioBox( itemDialog1, ID_PRINT_ALL_IN_ONE, _("Page Print:"), wxDefaultPosition, wxDefaultSize, m_PagesOptionPcbStrings, 1, wxRA_SPECIFY_COLS ); m_PagesOptionPcb->SetSelection(0); - itemBoxSizer12->Add(m_PagesOptionPcb, 0, wxGROW|wxALL, 5); + itemBoxSizer15->Add(m_PagesOptionPcb, 0, wxGROW|wxALL, 5); wxArrayString m_PagesOptionEeschemaStrings; m_PagesOptionEeschemaStrings.Add(_("Current")); m_PagesOptionEeschemaStrings.Add(_("All")); m_PagesOptionEeschema = new wxRadioBox( itemDialog1, ID_PRINT_ALL, _("Page Print:"), wxDefaultPosition, wxDefaultSize, m_PagesOptionEeschemaStrings, 1, wxRA_SPECIFY_COLS ); m_PagesOptionEeschema->SetSelection(0); - itemBoxSizer12->Add(m_PagesOptionEeschema, 0, wxGROW|wxALL, 5); + itemBoxSizer15->Add(m_PagesOptionEeschema, 0, wxGROW|wxALL, 5); - itemBoxSizer2->Add(5, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_FullDialogBowSizer->Add(5, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxBoxSizer* itemBoxSizer21 = new wxBoxSizer(wxVERTICAL); - itemBoxSizer2->Add(itemBoxSizer21, 0, wxALIGN_TOP|wxALL, 5); + m_ButtonsBoxSizer = new wxBoxSizer(wxVERTICAL); + m_FullDialogBowSizer->Add(m_ButtonsBoxSizer, 0, wxALIGN_TOP|wxALL, 5); - itemBoxSizer21->Add(5, 5, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); + m_ButtonsBoxSizer->Add(5, 5, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); - wxButton* itemButton23 = new wxButton( itemDialog1, ID_PRINT_SETUP, _("Print S&etup"), wxDefaultPosition, wxDefaultSize, 0 ); - itemButton23->SetForegroundColour(wxColour(121, 118, 0)); - itemBoxSizer21->Add(itemButton23, 0, wxGROW|wxALL, 5); + wxButton* itemButton26 = new wxButton( itemDialog1, ID_PRINT_SETUP, _("Print S&etup"), wxDefaultPosition, wxDefaultSize, 0 ); + itemButton26->SetForegroundColour(wxColour(121, 118, 0)); + m_ButtonsBoxSizer->Add(itemButton26, 0, wxGROW|wxALL, 5); - wxButton* itemButton24 = new wxButton( itemDialog1, ID_PRINT_PREVIEW, _("Pre&view"), wxDefaultPosition, wxDefaultSize, 0 ); - itemButton24->SetForegroundColour(wxColour(0, 0, 196)); - itemBoxSizer21->Add(itemButton24, 0, wxGROW|wxALL, 5); + wxButton* itemButton27 = new wxButton( itemDialog1, ID_PRINT_PREVIEW, _("Pre&view"), wxDefaultPosition, wxDefaultSize, 0 ); + itemButton27->SetForegroundColour(wxColour(0, 0, 196)); + m_ButtonsBoxSizer->Add(itemButton27, 0, wxGROW|wxALL, 5); - wxButton* itemButton25 = new wxButton( itemDialog1, ID_PRINT_EXECUTE, _("&Print"), wxDefaultPosition, wxDefaultSize, 0 ); - itemButton25->SetForegroundColour(wxColour(0, 128, 64)); - itemBoxSizer21->Add(itemButton25, 0, wxGROW|wxALL, 5); + wxButton* itemButton28 = new wxButton( itemDialog1, ID_PRINT_EXECUTE, _("&Print"), wxDefaultPosition, wxDefaultSize, 0 ); + itemButton28->SetForegroundColour(wxColour(0, 128, 64)); + m_ButtonsBoxSizer->Add(itemButton28, 0, wxGROW|wxALL, 5); m_CloseButton = new wxButton( itemDialog1, wxID_CANCEL, _("&Close"), wxDefaultPosition, wxDefaultSize, 0 ); m_CloseButton->SetDefault(); - itemBoxSizer21->Add(m_CloseButton, 0, wxGROW|wxALL, 5); + m_ButtonsBoxSizer->Add(m_CloseButton, 0, wxGROW|wxALL, 5); // Set validators m_ScaleOption->SetValidator( wxGenericValidator(& s_Scale_Select) ); @@ -247,8 +251,9 @@ void WinEDA_PrintFrame::CreateControls() m_PagesOptionEeschema->SetValidator( wxGenericValidator(& s_OptionPrintPage) ); ////@end WinEDA_PrintFrame content construction - m_CloseButton->SetFocus( ); // add this line to close dialog by the escape key - m_DialogPenWidth = new WinEDA_ValueCtrl(this, _("Pen width mini"), s_PrintPenMinWidth, + SetFocus( ); // add this line to close dialog by the escape key + + m_DialogPenWidth = new WinEDA_ValueCtrl(this, _("Pen width mini"), s_PrintPenMinWidth, g_UnitMetric, m_DialogPenWidthSizer, m_Parent->m_InternalUnits); SetOthersDatas(); diff --git a/share/dialog_print.h b/share/dialog_print.h index 097875a79f..20024f4b78 100644 --- a/share/dialog_print.h +++ b/share/dialog_print.h @@ -36,6 +36,7 @@ class wxBoxSizer; ////@begin control identifiers #define ID_DIALOG 10000 +#define ID_EXCLUDE_EDGES_PCB 10005 #define ID_SET_PRINT_SCALE 10004 #define ID_TEXTCTRL 10009 #define ID_TEXTCTRL1 10010 @@ -47,7 +48,6 @@ class wxBoxSizer; #define ID_PRINT_SETUP 10001 #define ID_PRINT_PREVIEW 10002 #define ID_PRINT_EXECUTE 10003 -#define ID_EXCLUDE_EDGES_PCB 10012 #define SYMBOL_WINEDA_PRINTFRAME_STYLE wxCAPTION|wxSYSTEM_MENU|wxCLOSE_BOX|MAYBE_RESIZE_BORDER #define SYMBOL_WINEDA_PRINTFRAME_TITLE _("Print") #define SYMBOL_WINEDA_PRINTFRAME_IDNAME ID_DIALOG @@ -130,20 +130,26 @@ public: ////@begin WinEDA_PrintFrame member variables + wxBoxSizer* m_FullDialogBowSizer; + wxBoxSizer* m_LeftBoxSizer; + wxBoxSizer* m_LayersSelectionsBoxSizer; wxBoxSizer* m_CopperLayersBoxSizer; wxBoxSizer* m_TechLayersBoxSizer; wxCheckBox* m_Exclude_Edges_Pcb; + wxBoxSizer* m_ScaleBoxSizer; wxRadioBox* m_ScaleOption; wxStaticText* m_FineAdjustXscaleTitle; wxTextCtrl* m_FineAdjustXscaleOpt; wxStaticText* m_FineAdjustYscaleTitle; wxTextCtrl* m_FineAdjustYscaleOpt; + wxStaticBox* m_OptionsBoxSizer; wxBoxSizer* m_DialogPenWidthSizer; wxCheckBox* m_Print_Sheet_Ref; wxCheckBox* m_Print_Mirror; wxRadioBox* m_ColorOption; wxRadioBox* m_PagesOptionPcb; wxRadioBox* m_PagesOptionEeschema; + wxBoxSizer* m_ButtonsBoxSizer; wxButton* m_CloseButton; ////@end WinEDA_PrintFrame member variables diff --git a/share/dialog_print.pjd b/share/dialog_print.pjd index 48e93e7aad..6087af416b 100644 --- a/share/dialog_print.pjd +++ b/share/dialog_print.pjd @@ -136,6 +136,7 @@ 0 "" 1 + 0 "" "Debug" "ANSI" @@ -177,6 +178,8 @@ "%AUTO%" "%AUTO%" "%AUTO%" + 0 + 1 @@ -289,7 +292,7 @@ 0 "wbBoxSizerProxy" "Horizontal" - "" + "m_FullDialogBowSizer" 0 0 0 @@ -303,22 +306,164 @@ 1 0 0 - "28/12/2006" + "25/8/2008" "wbBoxSizerProxy" "Vertical" - "m_CopperLayersBoxSizer" + "m_LeftBoxSizer" "Centre" - "Top" + "Expand" 0 5 - 1 - 1 + 0 + 0 1 1 0 0 0 "<Any platform>" + + "wxBoxSizer H" + "dialog-control-document" + "" + "sizer" + 0 + 1 + 0 + 0 + "25/8/2008" + "wbBoxSizerProxy" + "Horizontal" + "m_LayersSelectionsBoxSizer" + "Expand" + "Centre" + 0 + 5 + 1 + 1 + 1 + 1 + 0 + 0 + 0 + "<Any platform>" + + "wxBoxSizer V" + "dialog-control-document" + "" + "sizer" + 0 + 1 + 0 + 0 + "25/8/2008" + "wbBoxSizerProxy" + "Vertical" + "m_CopperLayersBoxSizer" + "Centre" + "Top" + 0 + 5 + 0 + 1 + 1 + 1 + 0 + 0 + 0 + "<Any platform>" + + + "wxBoxSizer V" + "dialog-control-document" + "" + "sizer" + 0 + 1 + 0 + 0 + "25/8/2008" + "wbBoxSizerProxy" + "Vertical" + "m_TechLayersBoxSizer" + "Centre" + "Top" + 0 + 5 + 1 + 1 + 1 + 1 + 0 + 0 + 0 + "<Any platform>" + + + + "wxCheckBox: ID_EXCLUDE_EDGES_PCB" + "dialog-control-document" + "" + "checkbox" + 0 + 1 + 0 + 0 + "25/8/2008" + "wbCheckBoxProxy" + "ID_EXCLUDE_EDGES_PCB" + 10005 + "" + "wxCheckBox" + "wxCheckBox" + 1 + 0 + "" + "" + "m_Exclude_Edges_Pcb" + "Exclude Edges_Pcb Layer" + 0 + "" + "Exclude contents of Edges_Pcb layer from all other layers" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + 1 + 1 + "<Any platform>" + 0 + 0 + 0 + 0 + 0 + 0 + 0 + "" + -1 + -1 + -1 + -1 + "Expand" + "Centre" + 0 + 5 + 1 + 1 + 1 + 1 + 0 + 0 + 0 + "" + "" + "wxBoxSizer V" @@ -332,33 +477,7 @@ "28/12/2006" "wbBoxSizerProxy" "Vertical" - "m_TechLayersBoxSizer" - "Centre" - "Top" - 0 - 5 - 1 - 1 - 1 - 1 - 0 - 0 - 0 - "<Any platform>" - - - "wxBoxSizer V" - "dialog-control-document" - "" - "sizer" - 0 - 1 - 0 - 0 - "28/12/2006" - "wbBoxSizerProxy" - "Vertical" - "" + "m_ScaleBoxSizer" "Centre" "Expand" 0 @@ -739,7 +858,6 @@ 0 "" "" - 0 @@ -807,7 +925,7 @@ "wxID_ANY" -1 "Options:" - "" + "m_OptionsBoxSizer" "" "" "" @@ -1214,7 +1332,7 @@ "28/12/2006" "wbBoxSizerProxy" "Vertical" - "" + "m_ButtonsBoxSizer" "Centre" "Top" 0 diff --git a/share/wxprint.cpp b/share/wxprint.cpp index 22dbac7c4b..b941aaac41 100644 --- a/share/wxprint.cpp +++ b/share/wxprint.cpp @@ -59,7 +59,7 @@ #define OPTKEY_LAYERBASE wxT( "PrintLayer_%d" ) #define OPTKEY_PRINT_X_FINESCALE_ADJ wxT( "PrintXFineScaleAdj" ) #define OPTKEY_PRINT_Y_FINESCALE_ADJ wxT( "PrintYFineScaleAdj" ) -#define OPTKEY_PRINT_SCALE wxT( "PrintScale" ) +#define OPTKEY_PRINT_SCALE wxT( "PrintScale" ) #endif #define DEFAULT_ORIENTATION_PAPER wxLANDSCAPE // other option is wxPORTRAIT @@ -92,7 +92,6 @@ static bool s_PrintMirror; static bool s_Print_Sheet_Ref = TRUE; - /****************************************************************/ /* frame de Preparation de l'impression (options, selections... */ /****************************************************************/ @@ -201,21 +200,27 @@ void WinEDA_PrintFrame::SetOthersDatas() { m_BoxSelecLayer[ii] = new wxCheckBox( this, -1, #if defined (PCBNEW) - ( (WinEDA_PcbFrame*) m_Parent )->m_Pcb->GetLayerName( ii ) ); + ( (WinEDA_PcbFrame*) m_Parent )->m_Pcb->GetLayerName( + ii ) ); #else - ReturnLayerName( ii ) ); + ReturnLayerName( ii ) ); #endif if( mask & s_SelectedLayers ) m_BoxSelecLayer[ii]->SetValue( TRUE ); if( ii < 16 ) m_CopperLayersBoxSizer->Add( m_BoxSelecLayer[ii], - wxGROW | wxLEFT | wxRIGHT | wxTOP | wxADJUST_MINSIZE ); + wxGROW | wxLEFT | wxRIGHT | wxTOP | wxADJUST_MINSIZE ); else m_TechLayersBoxSizer->Add( m_BoxSelecLayer[ii], - wxGROW | wxLEFT | wxRIGHT | wxTOP | wxADJUST_MINSIZE ); + wxGROW | wxLEFT | wxRIGHT | wxTOP | wxADJUST_MINSIZE ); } + // Option for excluding contents of "Edges Pcb" layer +#ifndef GERBVIEW + m_Exclude_Edges_Pcb->Show( true ); +#endif + // Read the scale adjust option if( config ) { @@ -343,7 +348,7 @@ wxString WinEDA_PrintFrame::BuildPrintTitle() wxString name, ext; wxFileName::SplitPath( m_Parent->GetBaseScreen()->m_FileName, - (wxString*) NULL, &name, &ext ); + (wxString*) NULL, &name, &ext ); name += wxT( "-" ) + ext; return name; } @@ -434,7 +439,7 @@ void WinEDA_PrintFrame::OnPrintPreview( wxCommandEvent& event ) wxString title = BuildPrintTitle(); wxPrintPreview* preview = new wxPrintPreview( new EDA_Printout( this, m_Parent, title, print_ref ), - new EDA_Printout( this, m_Parent, title, print_ref ), g_PrintData ); + new EDA_Printout( this, m_Parent, title, print_ref ), g_PrintData ); if( preview == NULL ) { @@ -455,7 +460,7 @@ void WinEDA_PrintFrame::OnPrintPreview( wxCommandEvent& event ) WSize.y += 6; wxPreviewFrame* frame = new wxPreviewFrame( preview, this, - title, WPos, WSize ); + title, WPos, WSize ); frame->Initialize(); frame->Show( TRUE ); @@ -715,7 +720,7 @@ void EDA_Printout::DrawPage() #ifdef PCBNEW double accurate_Xscale, accurate_Yscale; dc->SetUserScale( DrawZoom / scale * m_PrintFrame->m_XScaleAdjust, - DrawZoom / scale * m_PrintFrame->m_YScaleAdjust ); + DrawZoom / scale * m_PrintFrame->m_YScaleAdjust ); // Compute Accurate scale 1 { @@ -820,7 +825,11 @@ void EDA_Printout::DrawPage() panel->m_ClipBox.SetOrigin( wxPoint( -0x7FFFFF, -0x7FFFFF ) ); } - if ( !m_PrintFrame->m_Exclude_Edges_Pcb->GetValue() ) s_PrintMaskLayer |= EDGE_LAYER; +#ifndef GERBVIEW + if( !m_PrintFrame->m_Exclude_Edges_Pcb->GetValue() ) + s_PrintMaskLayer |= EDGE_LAYER; +#endif + panel->PrintPage( dc, 0, s_PrintMaskLayer ); #else